From 0c60f5608fc8f738eb138e32f583c329ed5aa81d Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 17 Mar 2021 14:46:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

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

diff --git a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreOrderAction.java b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreOrderAction.java
index bf18432..8598609 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreOrderAction.java
@@ -7,7 +7,7 @@
 
 /**
  * @description 订单表
- * @author yourName
+ * @author jyy
  * @date 2021-02-26 15:26
  */
 @RestController

--
Gitblit v1.9.1