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

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

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

@@ -739,8 +739,11 @@
                      'act' AS contentType,
                      IFNULL(ac2.CONTENT,'') AS firstPhoto,
                      false AS isExpirat,
-                     false AS isChanged,
-                     ai.`STATUS` AS status
+                    (case
+                    when  ai.`STATUS`='published' and  ai.IS_CHANGE='yes' then true
+                    else false
+                    end )as isChanged,
+                    ai.`STATUS` AS status
                  FROM group_act_info ai
                  LEFT JOIN group_act_content ac2 ON ac2.GROUP_ACT_ID = ai.ID AND ac2.CONTENT_TYPE = 'img' AND ac2.DEL_FLAG = 0 AND ac2.SORT = 1
                  WHERE ai.DEL_FLAG = '0'