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

jiangqs

2023-05-10 87f18dcf64a778555deb85312d4af93f86625c07

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


 Conflicts:

	ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java

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

@@ -45,12 +45,18 @@
    @ApiModelProperty(value = "商户名称")
    private String shopName;

    @ApiModelProperty(value = "商户编号")
    private String shopNumber;

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

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

    @ApiModelProperty(value = "员工头像")
    private String staffAvatar;


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

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java

@@ -33,11 +33,7 @@
@Service
public class ShopStaffServiceImpl extends ServiceImpl<ShopStaffMapper, ShopStaff> implements ShopStaffService {

    @Resource
    private ShopService shopService;

    @Resource
    private ShopRelUserService shopRelUserService;
    /**
     *
     * @param userId
@@ -68,6 +64,8 @@
        merStaffInfoVo.setShopServicePhone(shop.getShopServicePhone());
        merStaffInfoVo.setBusinessTime(shop.getBusinessStartTime()+"-"+shop.getBusinessEndTime());
        merStaffInfoVo.setShopType(shop.getShopType());
        merStaffInfoVo.setShopNumber(shop.getShopNumber());

        return merStaffInfoVo;
    }