From e1cc4a8ac8250d8f76d4d85f49b2b00a4047f0c9 Mon Sep 17 00:00:00 2001 From: jyy <jyy> Date: Sat, 11 Sep 2021 17:40:53 +0800 Subject: [PATCH] Merge branch 'score_shop' into api_score_meger --- zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrder.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrder.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrder.java index 761dd2a..1e19521 100644 --- a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrder.java +++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrder.java @@ -55,14 +55,14 @@ */ - private String userId; + private Long userId; /** * 收益人id */ - private String salesUserId; + private Long salesUserId; /** * 收益类型1,推广收益,2邀请收益 -- Gitblit v1.9.1