Merge branch 'master' of http://60.204.229.151:20080/chenkangxu/merchant-web

public/config/index-prod.js

@@ -13,7 +13,7 @@
   window.SITE_CONFIG = {};
 
   // 在线api接口请求地址
-  window.SITE_CONFIG["baseUrl"] = "https://admin-test.damajishi.cn/";
+  window.SITE_CONFIG["baseUrl"] = "https://admin.damajishi.cn/";
 
   // cdn地址 = 域名 + 版本号
   window.SITE_CONFIG["domain"] = "./"; // 域名

src/views/modules/operation-management/role/popup/add-or-update.vue

@@ -109,9 +109,9 @@ export default {
           label: "权限字段",
           prop: "col",
           type: "Input",
-          required: true,
+          required: false,
           rules: {
-            required: true,
+            required: false,
             message: "请输入权限字段",
             trigger: "blur",
           },
@@ -208,4 +208,4 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-</style>
+</style>