From e8242c8c4b69a52bd49fd0b5b49333e1d227e405 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 22 Sep 2023 16:45:52 +0800
Subject: [PATCH] Merge branch 'cjl' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-common/src/main/java/com/moral/constant/Constants.java | 22 ++++++++++++++++------
1 files changed, 16 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 5e7f627..6e416dd 100644
--- a/screen-common/src/main/java/com/moral/constant/Constants.java
+++ b/screen-common/src/main/java/com/moral/constant/Constants.java
@@ -114,6 +114,16 @@
* */
public static final String SYSTEM_DICT_TYPE_PURCHASER = "purchaser";
+ /**
+ * ������������������
+ */
+ public static final String WU_RAN_LEI_XING = "contaminate";
+
+ /**
+ * ������������������
+ */
+ public static final String ZHENG_GAI_LEI_XING = "reform";
+
/*
* ������������������������
* */
@@ -266,17 +276,17 @@
public static final String SERVER_WEATHER = "������������";
- public static final String EXCELLENT_WEATHER_CODE = "0";
+ public static final String EXCELLENT_WEATHER_CODE = "1";
- public static final String GOOD_WEATHER_CODE = "1";
+ public static final String GOOD_WEATHER_CODE = "2";
- public static final String MILD_WEATHER_CODE = "2";
+ public static final String MILD_WEATHER_CODE = "3";
- public static final String MIDDLE_WEATHER_CODE = "3";
+ public static final String MIDDLE_WEATHER_CODE = "4";
- public static final String SERIOUS_WEATHER_CODE = "4";
+ public static final String SERIOUS_WEATHER_CODE = "5";
- public static final String SERVER_WEATHER_CODE = "5";
+ public static final String SERVER_WEATHER_CODE = "6";
/*
* ������������
--
Gitblit v1.8.0