Merge remote-tracking branch 'origin/dev_bugfix' into dev

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

@@ -238,7 +238,7 @@
 	oper.MESSAGE_TEXT AS messageText,
 	CASE
 	  WHEN TO_DAYS(oper.CREATED_TIME) =  TO_DAYS(NOW()) THEN DATE_FORMAT(oper.CREATED_TIME,'%k:%i')
-      ELSE DATE_FORMAT(oper.CREATED_TIME,'%Y-%d-%m %k:%i')
+      ELSE DATE_FORMAT(oper.CREATED_TIME,'%Y-%m-%d %k:%i')
     END
 	  AS createdTime
     FROM