Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActCategoryFormDTO.java

@@ -21,8 +21,8 @@ public class ActCategoryFormDTO implements Serializable {
     /**
      * 组Id
      */
-    @NotBlank(message = "categoryCode不能为空", groups = ActCategoryFormDTO.AddUserInternalGroup.class)
+    @NotBlank(message = "menuCode不能为空", groups = ActCategoryFormDTO.AddUserInternalGroup.class)
-    private String categoryCode;
+    private String menuCode;
 
     @NotBlank(message = "tokenDto获取customerId为空", groups = ActCategoryFormDTO.AddUserInternalGroup.class)
     private String customerId;

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCategoryDictServiceImpl.java

@@ -79,9 +79,9 @@ public class ActCategoryDictServiceImpl extends BaseServiceImpl<ActCategoryDictD
      */
     @Override
     public List<CategoryCodeResultDTO> queryCategoryList(ActCategoryFormDTO formDTO) {
-        List<CategoryCodeResultDTO> list = baseDao.selectCategoryList(formDTO.getCategoryCode(), formDTO.getCustomerId());
+        List<CategoryCodeResultDTO> list = baseDao.selectCategoryList(formDTO.getMenuCode(), formDTO.getCustomerId());
         if (CollectionUtils.isEmpty(list)) {
-            list = baseDao.selectCategoryList(formDTO.getCategoryCode(), GroupActConstant.DEFAULT_CUSTOMER_ID);
+            list = baseDao.selectCategoryList(formDTO.getMenuCode(), GroupActConstant.DEFAULT_CUSTOMER_ID);
         }
         return list;
     }