From 2a7ec83cd11b811db884e215f94c5ed83fc92bc6 Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Wed, 12 Aug 2020 14:51:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 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 a17380d..ea3bd77 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
@@ -169,7 +169,7 @@
/**
* 默认超级管理员账号
*/
- public final static String ROOT = "admin";
+ public final static String ROOT = "admin-xg";
/**
* 负载均衡策略-版本号 信息头
@@ -251,20 +251,20 @@
* 生成缩略图需要的图片暂存目录
*/
// public static final String TEMP_IMAGE_PATH="D:/resources/images/";
- public static final String TEMP_IMAGE_PATH="/root/data";
+ public static final String TEMP_IMAGE_PATH="/root/kidgrow";
/**
* 普通医生角色ID
*/
public static final Long HOSPITAL_DOCTOR_ID=1268826800663289858L;
/**
- * 普通医生角色code标识
+ * 普通医生角色code标识`
*/
public static final String HOSPITAL_DOCTOR_CODE="hospital_doctor";
/**
* 管理员医生角色ID
*/
- public static final Long HOSPITAL_ADMIN_ID=9L;
+ public static final Long HOSPITAL_ADMIN_ID=1238826800663299909L;
/**
* 管理员医生角色code标识
*/
@@ -273,12 +273,12 @@
/**
* 自主注册医院的组织id
*/
- public static final Long HOSPITAL_ORG_ID=1273809987709677569L;
+ public static final Long HOSPITAL_ORG_ID=15321234570L;
/**
* 自主注册的科室组织id
*/
- public static final Long DEPARTMENT_ORG_ID=1273810374550335490L;
+ public static final Long DEPARTMENT_ORG_ID=15321234571L;
/**
* 自主注册的创建人id
@@ -289,9 +289,23 @@
*/
public static final String CREATE_USER_NAME= "自动创建";
/**
- * 管理员医生角色code标识
+ * 管理员角色code标识
*/
- public static final String SYSTEM_ADMIN_ROLE_CODE="ADMIN";
+ public static final String SYSTEM_ADMIN_ROLE_CODE="admin";
+
+ /**
+ * 销售主管角色code标识
+ */
+ public static final String SALE_MANAGER_ROLE_CODE="salemanager";
+
+ /**
+ * 喜高PC高管角色code标识
+ */
+ public static final String PC_ADMIN_ROLE_CODE="pc_admin";
+ /**
+ * 喜高运营高管角色code标识
+ */
+ public static final String OPRATIONMANAGER_ROLE_CODE="oprationmanager";
/**
* 集团组织级别
@@ -317,4 +331,8 @@
* 医生类型 C
*/
public static final Integer C_DOCTOR_TYPE=2;
+ /**
+ * 一个科室能最大试用多少次
+ */
+ public static final Integer MAX_FREE_COUNT=5;
}
--
Gitblit v1.8.0