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

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

@@ -29,7 +29,7 @@
           <if test="null != receiverGroupId and receiverGroupId !=''">
             and irg.id=#{receiverGroupId}
           </if>
-          order by irg.CREATED_TIME asc,igr.id asc
+          order by irg.CREATED_TIME desc
     </select>
 
     <!--  我创建的组内所有的人  -->

epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/InfoGroupReceiversDao.xml

@@ -16,7 +16,6 @@
             <foreach collection="groupIdList" item="groupId" separator="," open="(" close=")">
                 #{groupId}
             </foreach>
-            )
         </if>
     </select>