Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-03-17 0bcfecbfb194ab908fc33dee9cae43c7a77b608d

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

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

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

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