Merge remote-tracking branch 'origin/master'

jiangping

2023-12-15 b111c48e3c4608c82ddaaa9c5c976674a1faa3d9

 server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java

@@ -62,9 +62,7 @@
    public static final String ERP_USERSTATUS_RL ="ERP_USERSTATUS_RL" ;
    public static final String ERP ="ERP" ;

    public static   boolean DEALING_HK_IMG = false;
    public static  boolean DEALING_HK_ORG = false;
      public static  boolean DEALING_HK_USER = false;
    public static  boolean DEALING_HK_IMG = false;
    // ERP接口配置
    public static final String ERP_CONFIG = "ERP_CONFIG";
    // ERP ACCESS_KEY
@@ -72,6 +70,9 @@
    // ERP ACCESS_SECRET
    public static final String ERP_ACCESS_SECRET = "ERP_ACCESS_SECRET";

    // FTP文件服务器资源访问地址
    public static final String FTP_RESOURCE_PATH = "FTP_RESOURCE_PATH";

    public static  Date  getBirthdyByCardNo(String idCard){
    if(idCard ==null || idCard.length()<14){
        return null;