Merge branch 'master' into feature/订单服务单代码改造

姜友瑶

2022-05-23 ea865027c9e115057644f59747f3bed2a8a963e6

 zq-erp/src/main/java/com/matrix/system/padApi/dto/PadSkinDto.java

@@ -9,6 +9,9 @@
@Data
public class PadSkinDto extends BasePageDto {

    @ApiModelProperty(value = "会员id", example = "1")
    private Long  vipId;

    @ApiModelProperty(hidden = true)
    private Long shopId;