Merge remote-tracking branch 'origin/2.0' into 2.0

huliguo

2025-06-16 a966dafb8877552267a94fe8c544c5ea72cf5650

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/StaffShopPageDto.java

@@ -41,6 +41,9 @@
    @ApiModelProperty(value = "签约市code")
    private String signCityCode;

    @ApiModelProperty(value = "签约区code")
    private String signAreaCode;

    @ApiModelProperty(value = "扶持能力1.有2.没有")
    private Integer supportingCapacityFlag;