Merge remote-tracking branch 'origin/master'

liujie

2023-05-26 89ea5267bd4b4f5540b5eb3961c7c8ef3859a225

 src/main/java/com/stylefeng/guns/modular/system/model/TUserAddress.java

@@ -66,6 +66,8 @@
    private Integer remove;
    private String type;



    public String getType() {
        return type;
    }
@@ -73,8 +75,6 @@
    public void setType(String type) {
        this.type = type;
    }


    public Integer getId() {
        return id;
    }