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

jyy

2021-04-06 12990a5138e3fa8874a601bfb784a2b1147f0f24

 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>