Merge branch 'score_shop' into api_score_meger

jyy

2021-04-20 e09449ffcf303f67f5bbd168383b285600a251ec

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

@@ -15,8 +15,6 @@
   
   @ApiModelProperty(hidden = true)
   private Long companyId;
   @ApiModelProperty(hidden = true)
   private Integer applyStatus;

   
}