From 495fad8166b5952c013aea275243cb9ee6e7fa2a Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 10 Oct 2023 13:43:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into qa
---
screen-common/src/main/java/com/moral/constant/Constants.java | 19 +++++++++++++------
1 files changed, 13 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..ad910db 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,13 @@
* */
public static final String SYSTEM_DICT_TYPE_PURCHASER = "purchaser";
+ /**
+ * ������������������
+ */
+ public static final String WU_RAN_LEI_XING = "contaminate";
+
+
+
/*
* ������������������������
* */
@@ -266,17 +273,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