Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-07-26 0b806dd3c5159d8fac767cf027b0301e583d1161

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerStaffInfoVo.java

@@ -61,4 +61,10 @@
    @ApiModelProperty(value = "商户营业时间")
    private String businessTime;

    /**
     * 商户类型1.经销商2.代理商
     */
    @ApiModelProperty(value = "商户类型1.经销商2.代理商")
    private Integer shopType;

}