From 5586964c3e63f95c9e460a6a3d85d7dca408e096 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 18 Oct 2021 14:35:39 +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 | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 b780f74..6699393 100644
--- a/screen-common/src/main/java/com/moral/constant/Constants.java
+++ b/screen-common/src/main/java/com/moral/constant/Constants.java
@@ -222,22 +222,27 @@
/*
* ������
* */
- public static final String HOURYLYREPORT = "0";
+ public static final String HOURLY_REPORT = "0";
/*
* ������
* */
- public static final String DAILYREPORT = "1";
+ public static final String DAILY_REPORT = "1";
/*
* ������
* */
- public static final String WEEKLYREPORT = "2";
+ public static final String WEEKLY_REPORT = "2";
/*
* ������
* */
- public static final String MONTHLYREPORT = "3";
+ public static final String MONTHLY_REPORT = "3";
+
+ /*
+ * ���������������������
+ * */
+ public static final String NORMAL_FLAG = "N";
}
--
Gitblit v1.8.0