From 289b0503bc197d196997142f60b3a8ef8b70f0cc Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 11 Jun 2021 22:00:44 +0800
Subject: [PATCH] conflect fix
---
zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopShareQrcordDao.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopShareQrcordDao.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopShareQrcordDao.java
index 70f5611..785fc05 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopShareQrcordDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopShareQrcordDao.java
@@ -9,7 +9,7 @@
/**
* @description 分享二维码
- * @author yourName
+ * @author jyy
* @date 2019-09-18 09:42
*/
public interface ShopShareQrcordDao{
--
Gitblit v1.9.1