Merge branch 'feature/login-token' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java

@@ -46,6 +46,10 @@ import com.gic.member.api.service.MemberOpenCardBusinessService;
 import com.gic.mq.sdk.GicMQClient;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.wechat.api.dto.qywx.*;
+import com.gic.wechat.api.dto.qywx.welcome.QywxExternalMessageBaseDTO;
+import com.gic.wechat.api.dto.qywx.welcome.QywxImageExternalBaseDTO;
+import com.gic.wechat.api.dto.qywx.welcome.QywxMiniprogramExternalBaseDTO;
+import com.gic.wechat.api.dto.qywx.welcome.QywxWelcomeMsgDTO;
 import com.gic.wechat.api.enums.QywxMediaTypeEnum;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffClerkRelationApiServiceImpl.java

@@ -23,7 +23,7 @@ import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
 import com.gic.haoban.manage.service.entity.*;
 import com.gic.haoban.manage.service.service.*;
-import com.gic.wechat.api.dto.qywx.QywxExternalcontactDTO;
+import com.gic.wechat.api.dto.qywx.welcome.QywxExternalcontactDTO;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -175,7 +175,7 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
             infoDTO.setStoreName(nameMap.get(infoDTO.getStoreId()));
             if ((nameMap.get(infoDTO.getEnterpriseId())) != null) {
                 String EnterpriseandBrandName = nameMap.get(infoDTO.getEnterpriseId());
-                String split[] = EnterpriseandBrandName.split("_");
+                String[] split = EnterpriseandBrandName.split("_");
                 infoDTO.setEnterpriseName(split[0]);
                 if (split[1] != null) {
                     infoDTO.setBrandName(split[1]);