Merge branch 'prod' into dev

# Conflicts:
#	PCS/src/main/resources/application-prod.yml

PCS/src/main/java/cn/cslg/permission/common/model/vo/PersonnelVO.java

@@ -162,6 +162,10 @@ public class PersonnelVO extends BaseVO {
      * 剔除的人员Id
      */
     private List<Integer> notInPersonIds;
+    /**
+     * 租户类型
+     */
+    private String tenantType;
 
     /**
      * 部门职位绑定关系

PCS/src/main/java/cn/cslg/permission/service/LoginService.java

@@ -125,7 +125,7 @@ public class LoginService extends ServiceImpl<PersonnelMapper, Personnel> {
 
         //部门职位绑定信息
         List<PersonnelVO.DP> dpList = perDpService.getDPBaseMessageByPersonnelId(personnel.getId());
-        List<Integer> dutyDeparts =systemService.getDutyDeparts(personnel.getId());
+        List<Integer> dutyDeparts = systemService.getDutyDeparts(personnel.getId());
         //填充数据
         PersonnelVO personnelVO = new PersonnelVO();
         personnelVO
@@ -141,10 +141,11 @@ public class LoginService extends ServiceImpl<PersonnelMapper, Personnel> {
                 .setUsername(personnel.getPersonnelUserName())
                 .setTenantName(tenant.getTenantName())
                 .setTenantId(tenant.getId())
+                .setTenantType(tenant.getTenantType())
                 .setToken(StpUtil.getTokenValue())
                 .setRList(roleList)
                 .setDpList(dpList)
-                 .setDutyDeparts(dutyDeparts);
+                .setDutyDeparts(dutyDeparts);
 
         if (flag == 1) {
             personnelVO.setRoleType(1);