From 6ada97d503bd93722c081b66a9adcce7599e5536 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 14 Apr 2021 17:31:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/resources/mybatis/mybatis-config.xml |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mybatis-config.xml b/zq-erp/src/main/resources/mybatis/mybatis-config.xml
index ac77a00..66fe1b7 100644
--- a/zq-erp/src/main/resources/mybatis/mybatis-config.xml
+++ b/zq-erp/src/main/resources/mybatis/mybatis-config.xml
@@ -63,5 +63,6 @@
 		<typeAlias alias="ServicesFlow"  type="com.matrix.system.hive.bean.ServicesFlow" />
 		<typeAlias alias="VipAnswer"  type="com.matrix.system.hive.bean.VipAnswer" />
 		<typeAlias alias="SysWorktime"  type="com.matrix.system.hive.bean.SysWorktime" />
+		<typeAlias alias="SysOrderFlow"  type="com.matrix.system.hive.bean.SysOrderFlow" />
 	</typeAliases>
 </configuration>

--
Gitblit v1.9.1