Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-07-23 2ab5f166d0fad4b1a860fde3bab1adb46d062c3f

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

@@ -4,6 +4,9 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import io.swagger.annotations.ApiModelProperty;

import java.util.List;

/**
 * 省市区
@@ -20,28 +23,58 @@
     * 城市名称
     */
    @TableField("name")
    @ApiModelProperty("城市名称")
    private String name;
    /**
     * 城市行政code
     */
    @TableField("code")
    @ApiModelProperty("城市code")
    private String code;
    /**
     * 区号code
     */
    @TableField("citycode")
    @ApiModelProperty("区号code")
    private String citycode;
    /**
     * 父级id
     */
    @TableField("parent_id")
    @ApiModelProperty("父级id")
    private Integer parentId;
    /**
     * 英文
     */
    @TableField("english")
    @ApiModelProperty("英文名称")
    private String english;


    @TableField(exist = false)
    @ApiModelProperty("层级 1省 2市  3区")
    private Integer tire=3;

    @TableField(exist = false)
    @ApiModelProperty("下级")
    private List<Region> children;

    public Integer getTire() {
        return tire;
    }

    public void setTire(Integer tire) {
        this.tire = tire;
    }

    public List<Region> getChildren() {
        return children;
    }

    public void setChildren(List<Region> children) {
        this.children = children;
    }

    public Integer getId() {
        return id;
    }