From 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-common/src/main/java/com/moral/constant/Constants.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 a973063..bed1b1d 100644
--- a/screen-common/src/main/java/com/moral/constant/Constants.java
+++ b/screen-common/src/main/java/com/moral/constant/Constants.java
@@ -271,25 +271,35 @@
/*
* ������������
* */
- public static final String CITY_TYPE = "0";
+ public static final String CITY_TYPE = "city";
/*
* ������������
* */
- public static final String PROVINCE_TYPE = "1";
+ public static final String PROVINCE_TYPE = "province";
/*
* 28������������
* */
- public static final String TWENTY_EIGHT_CITIES = "2";
+ public static final String TWENTY_EIGHT_CITIES = "28";
/*
* ������������
* */
- public static final String YOY = "0";
+ public static final String YOY = "yoy";
/*
* ������������
* */
- public static final String QOQ = "1";
+ public static final String MOM = "mom";
+
+ /*
+ * ���������������
+ * */
+ public static final String YEAR = "year";
+
+ /*
+ * ���������������
+ * */
+ public static final String MONTH = "month";
}
--
Gitblit v1.8.0