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

huliguo

16 小时以前 c5d38d650d2ac4101b1293a4f17346e7d5420076

 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;