Merge remote-tracking branch 'origin/master'

nickchange

2023-11-27 0e382ffab8b3abba1d620187312cca90c81bae25

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/IntroduceQuery.java

@@ -10,7 +10,7 @@
    // 省
    private String province;
    // 市
    private String page;
    private String city;
    // 状态
    private Integer state;
    // 活动状态