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

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

@@ -1082,6 +1082,7 @@
           <if test="gridId != null and gridId.trim() != ''">
               and resi_group.GRID_ID=#{gridId}
           </if>
+            and resi_group.STATE = 'approved'
         order by resi_group.CREATED_TIME desc
     </select>
 </mapper>