Merge branch 'ty_fix' into score_shop

Helius

2021-11-19 402f3bbfb88548ac2952cd8de6dda68caf8871de

 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;

   
}