From e05adb8da62b72798fe273454d51bb36b2ee72de Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 13 May 2021 15:56:16 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-common/src/main/java/com/moral/constant/Constants.java | 12 +++++++++++-
1 files changed, 11 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..1703fcc 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 = "1";
/*
* ������������������
@@ -84,5 +84,15 @@
* */
public static final String DELETE_OPERATE_TYPE = "3";
+ /*
+ * ���������������������������������������
+ * */
+ public static final String FORMULA_PLACEHOLDER = "{0}";
+
+ /*
+ * ������������������
+ * */
+ public static final String SYSTEM_DICT_TYPE_UNIT = "unit";
+
}
--
Gitblit v1.8.0