Merge branch 'developer' into alpha

Helius

2022-03-15 5b94c18b2204a96be55798f1619a416526288e76

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

@@ -13,8 +13,11 @@
   @ApiModelProperty(value ="会员姓名")
   private String userName;
   
   @ApiModelProperty(value ="会员OPENID")
   private String userId;
   @ApiModelProperty(value ="会员ID")
   private Long userId;

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

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