beauty-erp.git - Gitblit

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

jyy

2021-06-09 ec87cf1ee2b9382bf9d089711f0ff82ae8e7077c

refs
author	jyy <jyy>
	Wednesday, June 9, 2021 20:44 +0800
committer	jyy <jyy>
	Wednesday, June 9, 2021 20:44 +0800
commit	ec87cf1ee2b9382bf9d089711f0ff82ae8e7077c
tree	c9c7535b586b7be380a525a799bbae32a8b1a73d tree \| zip \| gz
parent	7a8716132ea660525d4790349e05d59b3c369bb6 view \| diff 40d86303ae43c62c57dc7a60ace4ed40cc72ed5c view \| diff

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

# Conflicts:
#	zq-erp/src/main/resources/config/application.properties

19 files modified

11 files added

	zq-erp/pom.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java	14 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java	6 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveRule.java	33 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUse.java	5 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/bean/ShoppingGoods.java	26 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java	8 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveRuleDao.java	11 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/dto/AchieveNewStatisticsDto.java	41 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/service/AchieveRuleService.java	33 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java	49 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java	45 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java	80 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/vo/AchieveNewStatisticsVo.java	42 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hiveErp/action/AchieveRuleAction.java	129 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hiveErp/pojo/AchieveRuleItem.java	56 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/filecopy.java	80 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/config/application.properties	4 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml	101 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/AchieveRuleDao.xml	7 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/OnlinebookingDao.xml	24 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml	38 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive-erp/products/achieverule-list.html	402 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/achieveNewStatiostics.html	366 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-list-new.html	21 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/products/goods-form.html	34 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-md-list.html	11 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-zb-list.html	11 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html	21 ●●●●● diff \| view \| raw \| blame \| history