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

jyy

2021-03-16 67e2e142e752b724e021f3562c7f28e128e6f118

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

@@ -15,6 +15,12 @@
   
   @ApiModelProperty(value ="会员OPENID")
   private String userId;

   @ApiModelProperty(value ="申请记录ID")
   private String applyId;

    @ApiModelProperty(value = " 结算状态1，待结算，2，已结算，3已退款")
    private Integer orderType;
   
   @ApiModelProperty(hidden = true)
   private Long companyId;