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

Pu Zhibing

3 天以前 49c5117caef44d1e817d2ef701529dfaf1443467

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MgtShopIdByCodeDto.java

@@ -27,5 +27,8 @@
    @ApiModelProperty(value = "店铺名称")
    private String shopName;

    @ApiModelProperty(value = "归属员工di")
    private Long belongUserId;


}