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

jyy

2021-04-20 fa791f7796c1546b1329b52a3de8d753915cb4d5

 zq-erp/src/main/java/com/matrix/system/fenxiao/dto/AddSaleManApplyDto.java

@@ -7,12 +7,13 @@
@Data
@ApiModel(value = "AddSaleManApplyDto", description = "查询参数")
public class AddSaleManApplyDto {
	

   @ApiModelProperty(value ="会员ID")
    private String userId;
    private Long userId;

   
   @ApiModelProperty(value ="等级ID")
    private String gradeId;
    private Long gradeId;

    @ApiModelProperty(hidden = true)
    private Long companyId;