From 53939e0ceb528f45c4906c86ce499ecb864f7af8 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 15 Mar 2021 14:38:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalemanSettlement.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalemanSettlement.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalemanSettlement.java
index 3a653ca..176f3d8 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalemanSettlement.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalemanSettlement.java
@@ -7,8 +7,8 @@
/**
* @description 订单结算记录
- * @author jyy
- * @date 2021-03-10 15:22
+ * @author yourName
+ * @date 2021-03-10 17:34
*/
@Data
@TableName("shop_saleman_settlement")
--
Gitblit v1.9.1