From 247f19f6c3f17c2ac2f37b55c7d0550731f31ffe Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 25 Mar 2021 17:24:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 screen-common/src/main/java/com/moral/constant/Constants.java |   56 ++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 40 insertions(+), 16 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 d824510..7c1ed66 100644
--- a/screen-common/src/main/java/com/moral/constant/Constants.java
+++ b/screen-common/src/main/java/com/moral/constant/Constants.java
@@ -4,26 +4,50 @@
  * ������������������
  */
 public class Constants {
+    /*
+     * ���������������
+     * */
+    public static String DELETE = "1";
 
-    /**
-     * ������������
-     */
-    public static final String MSG_OPERATION_SUCCESS = "���������������";
+    /*
+     * ���������������
+     * */
+    public static String NOT_DELETE = "0";
 
-    /**
-     * ������������
-     */
-    public static final String MSG_OPERATION_FAILED = "���������������";
+    /*
+     * ���������������������������������
+     * */
+    public static String MANAGE_VERIFICATIONCODE_COLUMN = "type";
 
-    /**
-     * ������������code
-     */
-    public static final int CODE_OPERATION_SUCCESS = 0;
-    /**
-     * ������������code
-     */
-    public static final int CODE_OPERATION_FAILED = -1;
+    /*
+     * ������������������������������������
+     * */
+    public static String MANAGE_VERIFICATIONCODE_VALUE = "manage_verificationCode";
 
+    /*
+     * ���������������������
+     * */
+    public static String VERFICATIONCODE_OPEN = "1";
 
+    /*
+     * ���������������������
+     * */
+    public static String VERFICATIONCODE_CLOSE = "0";
 
+    /*
+     * ������������������
+     * */
+    public static String ORDER_ASC = "0";
+
+    /*
+     * ������������������
+     * */
+    public static String ORDER_DESC = "1";
+
+    /*
+    * ���������������������
+    * */
+    public static Integer DELETE_CHILDREN_ORG = 1;
+
+    public static Integer WEB_CHANNEL = 1;
 }

--
Gitblit v1.8.0