Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-07-26 0b5d21c6338bb3bd094a5bf2379001c4e9772eb5

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Phone.java

@@ -36,6 +36,11 @@
     */
    @TableField("companyId")
    private Integer companyId;
    /**
     * 开通城市id
     */
    @TableField("openCityId")
    private Integer openCityId;

    public Integer getId() {
        return id;
@@ -76,7 +81,15 @@
    public void setCompanyId(Integer companyId) {
        this.companyId = companyId;
    }

    
    public Integer getOpenCityId() {
        return openCityId;
    }
    
    public void setOpenCityId(Integer openCityId) {
        this.openCityId = openCityId;
    }
    
    @Override
    public String toString() {
        return "Phone{" +