Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/MemberAddress.java

@@ -70,7 +70,7 @@
    @TableLogic
    private Integer delFlag;

    @ApiModelProperty(value = "是否默认")
    @ApiModelProperty(value = "是否默认 1是其他，2 是默认")
    private Integer isDefault;

    @ApiModelProperty(value = "省份/直辖市")