From f342a0d88b2a7168f794d0cf545d16a3138acb6d Mon Sep 17 00:00:00 2001
From: wuqiping <wuqiping@qq.com>
Date: Wed, 09 Jun 2021 15:55:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-common/src/main/java/com/moral/constant/Constants.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/constant/Constants.java b/screen-common/src/main/java/com/moral/constant/Constants.java
index c7ae5cc..fb9db76 100644
--- a/screen-common/src/main/java/com/moral/constant/Constants.java
+++ b/screen-common/src/main/java/com/moral/constant/Constants.java
@@ -62,7 +62,7 @@
/*
* ���������������
* */
- public static final Integer WEB_CHANNEL = 1;
+ public static final String WEB_CHANNEL = "0";
/*
* ������������������
@@ -84,5 +84,35 @@
* */
public static final String DELETE_OPERATE_TYPE = "3";
+ /*
+ * ���������������������������������������
+ * */
+ public static final String FORMULA_PLACEHOLDER = "{0}";
+
+ /*
+ * ������������������
+ * */
+ public static final String SYSTEM_DICT_TYPE_UNIT = "unit";
+
+ /*
+ * ������������������
+ * */
+ public static final String SYSTEM_DICT_TYPE_PROFESSION = "profession";
+
+ /*
+ * ������������������������
+ * */
+ public static final String SYSTEM_DICT_TYPE_TECH = "tech";
+
+ /*
+ * ���������������������������
+ * */
+ public static final String SYSTEM_DICT_TYPE_DETECTOR = "detector";
+
+ /*
+ * ���������������������
+ * */
+ public static final String SYSTEM_DICT_TYPE_PURCHASER = "purchaser";
+
}
--
Gitblit v1.8.0