Merge remote-tracking branch 'origin/dev_staff_info' into develop

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/message/result/MyInfoGroupResultDTO.java

@@ -16,7 +16,7 @@ public class MyInfoGroupResultDTO implements Serializable {
     private static final long serialVersionUID = 3621868560778309056L;
     private String receiverGroupId;
     private String name;
-    private Integer totalMem;
+    private Integer staffNum;
     @JsonIgnore
     private List<String> staffIdList;
     private List<String> staffNameList;

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetmessage/InfoReceiversDao.xml

@@ -6,7 +6,7 @@
     <resultMap id="MyInfoGroupResultDTOMap" type="com.epmet.dataaggre.dto.message.result.MyInfoGroupResultDTO">
         <id property="receiverGroupId" column="receiverGroupId" />
         <result property="name" column="name"/>
-        <result property="totalMem" column="totalMem"/>
+        <result property="staffNum" column="staffNum"/>
         <collection property="staffIdList" ofType="java.lang.String">
             <result column="staffId"/>
         </collection>
@@ -16,7 +16,7 @@
         SELECT
             irg.ID as receiverGroupId,
             irg.`NAME` as name,
-            ( SELECT count( igr.id ) FROM info_group_receivers igr WHERE igr.DEL_FLAG = '0' AND igr.info_receiver_group_id = irg.id ) AS totalMem,
+            ( SELECT count( igr.id ) FROM info_group_receivers igr WHERE igr.DEL_FLAG = '0' AND igr.info_receiver_group_id = irg.id ) AS staffNum,
             igr.STAFF_ID as staffId
         FROM
             info_receiver_group irg