Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-08-05 52a40b6db35456112d8a470fc0e7f68207be6bfe

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/ShowModular.java

@@ -27,4 +27,9 @@
    //用户是否显示(1=是，2=否)
    @TableField("userShow")
    private Integer userShow;
    /**
     * 开通城市id
     */
    @TableField("openCityId")
    private Integer openCityId;
}