From b0ee5ab18f8242d0ca81966c07db00e0c6274831 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 14 Mar 2021 07:21:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/java/com/matrix/system/score/entity/ScoreOrder.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreOrder.java b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreOrder.java
index 82472b7..04d3fc7 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreOrder.java
+++ b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreOrder.java
@@ -9,7 +9,7 @@
 
 /**
  * @description 订单表
- * @author yourName
+ * @author jyy
  * @date 2021-02-26 15:26
  */
 @Data

--
Gitblit v1.9.1