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/ShopDeliveryDetailDao.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopDeliveryDetailDao.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopDeliveryDetailDao.java
index d9860f1..96bed1a 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopDeliveryDetailDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopDeliveryDetailDao.java
@@ -8,7 +8,7 @@
 
 /**
  * @description 发货明细
- * @author yourName
+ * @author jyy
  * @date 2019-10-21 15:02
  */
 public interface ShopDeliveryDetailDao{

--
Gitblit v1.9.1