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

jiangqs

2023-05-09 0398509aa5f27bd6f987adf3d24eceef56b07b4c

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

@@ -42,6 +42,17 @@
    @ApiModelProperty(value = "员工生日")
    private String staffBirthday;

    @ApiModelProperty(value = "商户名称")
    private String shopName;

    @ApiModelProperty(value = "商户地址")
    private String shopAddress;

    @ApiModelProperty(value = "商户电话")
    private String shopServicePhone;


    @ApiModelProperty(value = "商户营业时间")
    private String businessTime;

}