Merge remote-tracking branch 'origin/master'

puzhibing

2023-05-18 53562814add61acfdc02d6b25dae6324f6fd5f92

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAdvertisement.java

@@ -68,14 +68,14 @@
    /**
     * 所属省Id
     */
    private Integer provinceId;
    private Integer cityId;

    public Integer getProvinceId() {
        return provinceId;
    public Integer getCityId() {
        return cityId;
    }

    public void setProvinceId(Integer provinceId) {
        this.provinceId = provinceId;
    public void setCityId(Integer cityId) {
        this.cityId = cityId;
    }

    public Integer getState() {