Merge branch 'dev'

epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java

@@ -255,9 +255,9 @@ public class SsoServiceImpl implements SsoService {
                 //5.生成token存到redis并返回
                 userTokenResultDTO = new UserTokenResultDTO();
                 userTokenResultDTO.setCustomerId(customerId);
-                String token = generateToken(AppClientConstant.APP_GOV, AppClientConstant.CLIENT_SSO, userId);
+                String token = generateToken(AppClientConstant.APP_GOV, AppClientConstant.CLIENT_WEB, userId);
                 userTokenResultDTO.setToken(token);
-                disposeTokenDto(AppClientConstant.APP_GOV, AppClientConstant.CLIENT_SSO, userId, token, customerId);
+                disposeTokenDto(AppClientConstant.APP_GOV, AppClientConstant.CLIENT_WEB, userId, token, customerId);
                 // 6.发送登录事件
                 try {
                     SpringContextUtils.getBean(ThirdLoginService.class).sendLoginEvent(userId, "数字社区登录",
@@ -320,7 +320,7 @@ public class SsoServiceImpl implements SsoService {
     }
 
     /**
-     * @Description 居民端登陆生成业务token的key
+     * @Description 登陆生成业务token的key
      * @Param app
      * @Param client
      * @Param userId

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java

@@ -7,7 +7,7 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 
 /**
- * 公共服务图层
+ * 公共服务(旅游资源)图层
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2022-06-16