From ff35af8957b36ca638c6e8155db2303104515ff7 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 23 Aug 2023 13:55:17 +0800
Subject: [PATCH] Merge branch 'cjl' into qa
---
screen-api/src/main/java/com/moral/api/config/properties/SpecialCitiesProperties.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/config/properties/SpecialCitiesProperties.java b/screen-api/src/main/java/com/moral/api/config/properties/SpecialCitiesProperties.java
index 2f2c2b1..850f340 100644
--- a/screen-api/src/main/java/com/moral/api/config/properties/SpecialCitiesProperties.java
+++ b/screen-api/src/main/java/com/moral/api/config/properties/SpecialCitiesProperties.java
@@ -24,6 +24,8 @@
private List<SysArea> heBeiEightCities;
+ private List<SysArea> oneSixEightCities;
+
public boolean isTwentyEightCities(Integer cityCode){
for (SysArea city : twentyEightCities) {
if(city.getAreaCode().equals(cityCode))
@@ -40,4 +42,12 @@
return false;
}
+ public boolean isOneSixEightCities(Integer cityCode){
+ for (SysArea city : oneSixEightCities) {
+ if(city.getAreaCode().equals(cityCode))
+ return true;
+ }
+ return false;
+ }
+
}
--
Gitblit v1.8.0