Merge remote-tracking branch 'origin/master'

44323

2023-10-11 f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3

 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;
    // 活动状态