From cbbec843f32b5507c04ed394b8e6a7a61c1d23a0 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Thu, 15 Apr 2021 16:33:31 +0800 Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop --- zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanApply.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanApply.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanApply.java index 7894732..80bb8a8 100644 --- a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanApply.java +++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanApply.java @@ -25,6 +25,10 @@ * 审核状态-3未通过 */ public static final int APPLY_STATUS_WTG = 3; + /** + * 审核状态-4系统删除 + */ + public static final int APPLY_STATUS_XTQX = 4; /** @@ -50,11 +54,11 @@ private Integer applyWay; @ApiModelProperty(value = "申请用户id") - private String userId; + private Long userId; @ApiModelProperty(value = "邀请用户ID") - private String parentUserId; + private Long parentUserId; @ApiModelProperty(value = "申请状态1、待审核，2通过，3未通过") -- Gitblit v1.9.1