From 95f9ea7eb339c36cade6c67d0385c49ec2d81477 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 14 Apr 2021 19:39:45 +0800
Subject: [PATCH] Merge branch 'score_shop' 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