Merge branch 'score_shop' into api_score_meger

jyy

2021-09-25 4f4fd43c199ff802df896256bc012a7277fdd4a1

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

@@ -9,13 +9,11 @@
public class AddSaleManApplyDto {

   @ApiModelProperty(value ="会员ID")
    private String userId;
	
   @ApiModelProperty(value = "申请用户openId")
   private String openId;
    private Long userId;

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

    @ApiModelProperty(hidden = true)
    private Long companyId;