Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-ui/src/views/pile/merchant/components/adapayMember.vue

@@ -5,7 +5,7 @@
          </div> -->
         <el-card v-if="adapayMember == null" shadow="hover" style="margin-bottom:10px">
             <div style="margin: 12px 0" >
-                没有查询到汇付会员配置，请点击按钮创建会员信息及结算账号
+                没有查询到会员基本信息，请点击按钮创建会员信息及结算账号
                 <!-- 刷新按钮 -->
                 <el-button
                     size="medium"

jsowell-ui/src/views/pile/merchant/index.vue

@@ -361,13 +361,14 @@ export default {
                         message: "请输入运营商名称",
                         trigger: "blur",
                     },
+                    { min: 1, max: 35, message: '长度在 1 到 35 个字符', trigger: 'blur' }
                 ],
                 organizationCode: [
                     {
                         required: true,
                         message: "请输入组织机构代码",
                         trigger: "blur",
-                    },
+                    }
                 ],
                 address: [
                     { required: true, message: "请输入地址", trigger: "blur" },