Merge branch 'dev_bugfix' into dev_temp

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageExtServiceImpl.java

@@ -55,9 +55,9 @@ public class WxmpMessageExtServiceImpl implements WxmpMessageExtService {
                     wxSubscribeMessageFormDTO.setClientType(ExtConstant.APP_RESI);
                 }
                 //2020.12.23 sun 数据库字段key值有work改成gov  外挂接口直接传的gov不用再转换
-                /*if (ExtConstant.APP_GOV.equals(dto.getApp())){
-                    wxSubscribeMessageFormDTO.setClientType(ExtConstant.APP_WORK);
-                }*/
+                if (ExtConstant.APP_GOV.equals(dto.getApp())){
+                    wxSubscribeMessageFormDTO.setClientType(ExtConstant.APP_GOV);
+                }
                 wxSubscribeMessageFormDTO.setBehaviorType(dto.getTitle());
                 wxSubscribeMessageFormDTO.setMessageTime(new Date());
                 wxmpMsgList.add(wxSubscribeMessageFormDTO);