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

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

@@ -488,7 +488,7 @@
         resi_topic topic LEFT JOIN resi_group groupp ON topic.group_id = groupp.ID AND groupp.del_flag = '0' AND groupp.customer_id = #{customerId}
         WHERE
         topic.del_flag = '0'
-        and topic`STATUS`!='hidden'
+        and topic.`STATUS`!='hidden'
         AND
         topic.id IN (
         SELECT  DISTINCT topic_id  FROM resi_topic_comment  WHERE