Merge branch 'alpha' of http://120.27.238.55:7000/r/beauty-erp into alpha

Helius

2022-06-09 d524c2c3f60032916218a638ee5fa610cd2a330c

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

@@ -12,6 +12,9 @@
    @ApiModelProperty(value = "会员id", example = "1")
    private Long  vipId;

    @ApiModelProperty(value = "状态", example = "")
    private String state;

    @ApiModelProperty(hidden = true)
    private Long shopId;