Merge branch 'MVP1.5.9' into develop

yifu-insurances/yifu-insurances-biz/src/main/resources/application-dev.yml

@@ -20,8 +20,8 @@ spring:
       type: com.zaxxer.hikari.HikariDataSource
       driver-class-name: com.mysql.cj.jdbc.Driver
       username: root
-      password: ekp!@#123
-      jdbc-url: jdbc:mysql://36.7.147.19:20023/ekp?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+      password: ll_mysql
+      jdbc-url: jdbc:mysql://192.168.1.122:33306/ekp?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
     hikari:
       minimum-idle: 10 # 最小空闲连接数量
       idle-timeout: 60000 # 空闲连接存活最大时间，默认600000（10分钟）

yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/SysUserPermissionServiceImpl.java

@@ -71,7 +71,8 @@ public class SysUserPermissionServiceImpl extends ServiceImpl<SysUserPermissionM
 			}
 		}
 		if (CommonConstants.SIX_STRING.equals(sysUserPermission.getPermissionType())
-				|| CommonConstants.SEVEN_STRING.equals(sysUserPermission.getPermissionType())) {
+				|| CommonConstants.SEVEN_STRING.equals(sysUserPermission.getPermissionType())
+				|| CommonConstants.TEN_STRING.equals(sysUserPermission.getPermissionType())) {
 			permission = this.getOne(Wrappers.<SysUserPermission>query().lambda()
 					.eq(SysUserPermission::getEmpLoginName, sysUserPermission.getEmpLoginName())
 					.eq(SysUserPermission::getPermissionType, sysUserPermission.getPermissionType())

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java

@@ -541,6 +541,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 		sendMap.put("fd_3b3d3ec85bfeb0", s.getSalaryMonth().substring(0, 4)
 				+ CommonConstants.CENTER_SPLIT_LINE_STRING + s.getSalaryMonth().substring(4, 6));
 		sendMap.put("fd_3b73e18ad34090", "否");
+		sendMap.put("fd_3c3fd0da14ed9a", s.getCreateName());
 
 		if (Common.isNotNull(s.getIssueStatus()) && s.getIssueStatus() == 1) {
 			sendMap.put("fd_3b73e18ad34090", "是");