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/result/CategoryDTO.java

@@ -12,7 +12,7 @@ import java.io.Serializable;
  */
 @Data
 public class CategoryDTO implements Serializable {
-    private String categoryCode;
+    private String menuCode;
     private String categoryName;
     private String parentCode;
 }

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActCategoryDictDao.xml

@@ -5,7 +5,7 @@
         <!--   查询一级类别  -->
         <select id="selectFirstLevelCategory" resultType="com.epmet.resi.group.dto.act.result.CategoryDTO" parameterType="java.lang.String">
                 SELECT
-                    acd.CATEGORY_CODE as categoryCode,
+                    acd.CATEGORY_CODE as menuCode,
                     acd.CATEGORY_NAME as categoryName,
                     acd.PARENT_CODE as parentCode
                 FROM