Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-07 21db21a114356e0704a3483c1a3f22b96ea6658b

 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>