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

cjl

2023-08-18 acb0dc47e516cf6942ebe268d9a3fce7944963b9

 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;
    }

}