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

jyy

2021-05-22 3e85a137adb035e4808e95edf7017f7f204900d9

 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>