From ddebb2ea352012c10ec31a9d9774b0320af4caac Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 10 Jun 2021 16:48:15 +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 | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 fb9db76..a56abbd 100644
--- a/screen-common/src/main/java/com/moral/constant/Constants.java
+++ b/screen-common/src/main/java/com/moral/constant/Constants.java
@@ -85,18 +85,18 @@
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";
/*
@@ -115,4 +115,10 @@
public static final String SYSTEM_DICT_TYPE_PURCHASER = "purchaser";
+ /*
+ * ������������������������
+ * */
+ public static final String UN_ADJUST = "unadjust";
+
+
}
--
Gitblit v1.8.0