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

jyy

2021-06-19 693f6204a6db2b4b1b80b562fcc1dccc09bb26e7

 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>