From d85af61932a03bd03663daf9da33177af5824a5c Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 14:09:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopPage.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopPage.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopPage.java
index 1491fe8..fec783a 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopPage.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopPage.java
@@ -6,7 +6,7 @@
/**
* @description 小程序页面
- * @author yourName
+ * @author jyy
* @date 2020-04-03 14:56
*/
public class ShopPage extends EntityDTO{
--
Gitblit v1.9.1