push

yd-common/src/main/java/com/yd/common/enums/CommonEnum.java

@@ -82,6 +82,8 @@ public enum CommonEnum {
     UID_TYPE_AGENT_ACCUMULATED_FYC("fyc","业务员累计积分表"),
     UID_TYPE_AGENT_ACCUMULATED_FYC("fyc","业务员累计积分表"),
     UID_TYPE_AGENT_ACCUMULATED_FYC_LOG("fyc_log","业务员累计积分表操作日志记录表"),
     UID_TYPE_AGENT_ACCUMULATED_FYC_LOG("fyc_log","业务员累计积分表操作日志记录表"),
     UID_TYPE_EVALUATE_RANK("evaluate_rank","评定职级表"),
     UID_TYPE_EVALUATE_RANK("evaluate_rank","评定职级表"),
+    UID_TYPE_SALARY("salary","薪资单表"),
+    UID_TYPE_SALARY_REMITTANCE("salary_remittance","薪资汇款明细表"),
 
 
     //作用域枚举
     //作用域枚举
     SCOPE_SYS("1","系统级（全局）"),
     SCOPE_SYS("1","系统级（全局）"),

yd-common/src/main/java/com/yd/common/utils/EnglishTextUtil.java

@@ -38,6 +38,6 @@ public final class EnglishTextUtil {
         System.out.println(toLowerCase("扎根"));  // hello world
         System.out.println(toLowerCase("扎根"));  // hello world
         System.out.println(toLowerCase("JAVA IS FUN"));  // java is fun
         System.out.println(toLowerCase("JAVA IS FUN"));  // java is fun
         System.out.println(toLowerCase(null));           // null
         System.out.println(toLowerCase(null));           // null
-        System.out.println(toLowerCaseSafe(null));       // (空字符串)
+        System.out.println(toLowerCaseSafe(""));       // (空字符串)
     }
     }
 }
 }
\ No newline at end of file