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

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/SendMqMsgUtils.java

@@ -53,8 +53,9 @@ public class SendMqMsgUtils {
             Result<String> result = null;
             log.info("sendMsg url:{},param:{}", msg.getRequestUrl(), JSON.toJSONString(msg));
             do {
+                retryTime++;
                 result = HttpClientManager.getInstance().sendPostByHttps(msg.getRequestUrl(), JSON.toJSONString(msg));
-                log.info("sendMsg retryTime:{},result:{}", retryTime++, JSON.toJSONString(result));
+                log.info("sendMsg retryTime:{},result:{}", retryTime, JSON.toJSONString(result));
             } while ((!result.success()) && retryTime < 2);
 
             if (result.success()) {

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -1640,7 +1640,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
      * @date 2020.11.20 10:26
      */
     @Override
-    //TODO @Transactional
+    @Transactional
     public FirstTopicShiftedToIssueApplicationResultDTO shiftIssueV2(ResiTopicTurnIssueFromDTO topicTurnIssueFromDTO) {