Merge remote-tracking branch 'origin/dev_2307' into dev_2307

ant-design-vue-jeecg/src/views/modulex/ModulexList.vue

@@ -572,7 +572,6 @@ export default {
         note: ['对应模块(必填)：填写正确的模块名称',
             '对应功能(必填)：填写正确的功能名称',
             '对应实体(必填)：填写正确的实体名称',
-            '对应字段(必填)：填写正确的字段名称',
           '顺序号(必填)；同功能下不重复',
           '规则编码(必填):功能编码+顺序号（格式001）',
           '规则描述(非必填)',

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/rulex/controller/RulexController.java

@@ -284,7 +284,7 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
                                 list.get(i).getFunctionId() == null ||
 //							 list.get(i).getDiagrams() == null &&
                                 list.get(i).getTableId() == null ||
-                                list.get(i).getFieldId() == null ||
+//                                list.get(i).getFieldId() == null ||
                                 list.get(i).getManagerUsers() == null ||
                                 list.get(i).getWorkLevel() == null ||
                                 list.get(i).getWorkStatus() == null ||