From b7265cdd6f3e1fbb0d428c27e5b5e29e34d56953 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 17 Nov 2020 17:55:21 +0800
Subject: [PATCH] Merge branch 'dev'
---
kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java
index 9e8ddbf..767fc85 100644
--- a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java
+++ b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java
@@ -274,18 +274,18 @@
public static final String HOSPITAL_ADMIN_CODE="hospital_admin";
/**
- * 自主注册医院的组织id
+ * 自主注册医院的上级组织id
*/
- public static final Long HOSPITAL_ORG_ID=15321234570L;
+ public static final Long ORG_PARENT_ID=15321234561L;
- /**
- * 自主注册的科室组织id
- */
- public static final Long DEPARTMENT_ORG_ID=15321234571L;
/**
* 自主注册的用户默认给的产品id
*/
public static final Long REG_USER_PRODUCT_ID=1000000000000000001L;
+ /**
+ * 单次支付用户固定使用的套餐id
+ */
+ public static final Long PAY_USER_PRODUCT_ID=1000000000000000000L;
/**
* 自主注册的用户合同时长 天
*/
@@ -293,7 +293,7 @@
/**
* 自主注册的用户合同名
*/
- public static final String REG_USER_CONTRACT_NAME="注册用户免费合同";
+ public static final String REG_USER_CONTRACT_NAME="自动创建合同";
/**
* 自主注册的创建人id
*/
@@ -306,11 +306,23 @@
* 管理员角色code标识
*/
public static final String SYSTEM_ADMIN_ROLE_CODE="admin";
+ /**
+ * 自主注册的销售服务人员id
+ */
+ public static final Long SALE_USER_ID= 1289806543902457857L;
+ /**
+ * 自主注册的运营人员id
+ */
+ public static final Long OPRATION_USER_ID= 1289806733313032193L;
/**
* 销售主管角色code标识
*/
public static final String SALE_MANAGER_ROLE_CODE="salemanager";
+ /**
+ * 用于标识存储最后一次诊断redis的key,用于防止最后一个读片后无法生成报告
+ */
+ public static final String SAAS_LAST_SERVER="saaslastserver";
/**
* 喜高PC高管角色code标识
--
Gitblit v1.8.0