Merge branch 'score_shop' into ty_fix

Helius

2021-11-02 af7f37cbb7a0694c882bdc91174dca39796ad4ad

 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;

   
}