From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Tue, 22 Feb 2022 23:41:42 +0800 Subject: [PATCH] Merge branch 'developer' --- zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanApply.java | 11 +++++++++-- 1 files changed, 9 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 fc2bfd5..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未通过") @@ -63,6 +67,9 @@ @ApiModelProperty(value = "备注") private String remark; + @ApiModelProperty(value = "等级ID") + private long gradeId; + /** * 公司ID */ -- Gitblit v1.9.1