Merge branch 'dev_thirdplatform' into dev

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SubscribeServiceImpl.java

@@ -284,6 +284,7 @@ public class SubscribeServiceImpl implements SubscribeService {
 				}
 				String tmplId = wxResult.getData();
 				PersonalTemplateDTO personalTemplate = ConvertUtils.sourceToTarget(templateDTO, PersonalTemplateDTO.class);
+				personalTemplate.setId(null);
 				personalTemplate.setPriTmplId(tmplId);
 				personalTemplate.setCustomerId(formDTO.getCustomerId());
 				personalTemplate.setClientType("resi");
@@ -312,9 +313,10 @@ public class SubscribeServiceImpl implements SubscribeService {
 				}
 				String tmplId = wxResult.getData();
 				PersonalTemplateDTO personalTemplate = ConvertUtils.sourceToTarget(templateDTO, PersonalTemplateDTO.class);
+				personalTemplate.setId(null);
 				personalTemplate.setPriTmplId(tmplId);
 				personalTemplate.setCustomerId(formDTO.getCustomerId());
-				personalTemplate.setClientType("resi");
+				personalTemplate.setClientType("work");
 				personalTemplate.setAppId(authInfo.getAuthorizerAppid());
 				personalTemplateService.save(personalTemplate);
 			});