From e0965debdfc7149b9490d66d45c8737ca574ed21 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 15 十二月 2023 14:47:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java b/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
index 84e1f7f..69242b4 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -56,6 +56,12 @@
public static final String FTP_USERNAME ="FTP_USERNAME" ;
public static final String FTP_PWD ="FTP_PWD" ;
public static final String FTP_RESOURCE_PATH ="FTP_RESOURCE_PATH" ;
+ public static final String ERP_ORGLIST_URL ="ERP_ORGLIST_URL" ;
+ public static final String ERP_USERLIST_URL ="ERP_USERLIST_URL" ;
+ public static final String ERP_APPROVE_URL ="ERP_APPROVE_URL" ;
+ public static final String ERP_USERSTATUS_RL ="ERP_USERSTATUS_RL" ;
+ public static final String ERP ="ERP" ;
+
public static boolean DEALING_HK_IMG = false;
// ERP鎺ュ彛閰嶇疆
public static final String ERP_CONFIG = "ERP_CONFIG";
@@ -64,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;
--
Gitblit v1.9.3