From 6f12948893fcc846dfb32aa861c473a842edcd56 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 23 Jun 2021 14:46:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-common/src/main/java/com/moral/constant/Constants.java | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 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..535af51 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,46 @@
* */
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";
+
+
+ /*
+ * ������������������������
+ * */
+ public static final String UN_ADJUST = "unadjust";
+
+ /*
+ * ���������������������
+ * */
+ public static final String DEVICE_STATE_OFFLINE = "4";
+
}
--
Gitblit v1.8.0