Merge remote-tracking branch 'origin/wb_21' into dev

jinpengyong

2023-08-23 b1bfa089b5b299c1c3c71094e450748a5e5e8a75

 screen-api/src/main/java/com/moral/api/config/properties/SpecialCitiesProperties.java

@@ -42,4 +42,12 @@
        return false;
    }

    public boolean isOneSixEightCities(Integer cityCode){
        for (SysArea city : oneSixEightCities) {
            if(city.getAreaCode().equals(cityCode))
                return true;
        }
        return false;
    }

}