From 8ea75b6f027f18f6daf229e43928f78b49740f79 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Wed, 04 Nov 2020 16:51:36 +0800
Subject: [PATCH] Merge branch 'dev'

---
 kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 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 97ab00f..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
@@ -283,13 +283,17 @@
      */
     public static final Long REG_USER_PRODUCT_ID=1000000000000000001L;
     /**
+     * 单次支付用户固定使用的套餐id
+     */
+    public static final Long PAY_USER_PRODUCT_ID=1000000000000000000L;
+    /**
      * 自主注册的用户合同时长 天
      */
     public static final Integer REG_USER_CONTRACT_DAY=15;
     /**
      * 自主注册的用户合同名
      */
-    public static final String REG_USER_CONTRACT_NAME="注册用户免费合同";
+    public static final String REG_USER_CONTRACT_NAME="自动创建合同";
     /**
      * 自主注册的创建人id
      */
@@ -315,6 +319,10 @@
      * 销售主管角色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