From 3954537f11c1c6fbfc62a6233102c530e3202ba1 Mon Sep 17 00:00:00 2001 From: wzy <wzy19931122ai@163.com> Date: Sat, 10 Jul 2021 14:25:55 +0800 Subject: [PATCH] Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into data_move --- zq-erp/src/main/java/com/matrix/system/fenxiao/dto/ShopSalesmanDetailDto.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/ShopSalesmanDetailDto.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/ShopSalesmanDetailDto.java index e9e771e..a16bfa5 100644 --- a/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/ShopSalesmanDetailDto.java +++ b/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; -- Gitblit v1.9.1