From 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 08 四月 2019 15:15:09 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/test/java/org/fanli/MyBatisProduce.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/fanli/src/test/java/org/fanli/MyBatisProduce.java b/fanli/src/test/java/org/fanli/MyBatisProduce.java
index 7dfc3a0..7a503cf 100644
--- a/fanli/src/test/java/org/fanli/MyBatisProduce.java
+++ b/fanli/src/test/java/org/fanli/MyBatisProduce.java
@@ -1,20 +1,21 @@
package org.fanli;
-import org.junit.Ignore;
import org.junit.Test;
import org.yeshi.utils.mybatis.ColumnParseUtil;
import org.yeshi.utils.mybatis.MyBatisMapperUtil;
-import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail;
+import com.yeshi.fanli.entity.bus.invite.SpreadUserImg;
+import com.yeshi.fanli.entity.bus.user.LostOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
+import com.yeshi.fanli.entity.taobao.TaoBaoOrderTradeMap;
-@Ignore
+//@Ignore
public class MyBatisProduce {
@Test
public void test3() {
- MyBatisMapperUtil.createMapper(MsgOtherDetail.class);
+ MyBatisMapperUtil.createMapper(TaoBaoOrderTradeMap.class);
// MyBatisMapperUtil.createMapper(TaoBaoUnionAuthRecord.class);
}
--
Gitblit v1.8.0