parent: a2d8b4 | patch | commitdiff
jyy
2021-07-14 7c92603d6548e7405a298d3c4996942acd999376
refs
author jyy <jyy>
Wednesday, July 14, 2021 17:35 +0800
committer jyy <jyy>
Wednesday, July 14, 2021 17:35 +0800
commit7c92603d6548e7405a298d3c4996942acd999376
tree 77f29b9eeeb9318497e497c3bbe45d7d426e7363 tree | zip | gz
parent a2d8b47677fcf9eff87faff1bb89a8674714ddd7 view | diff
ac4b6618b3942aace2541e2774b8df6644762157 view | diff 
Merge branch 'score_shop' into api_score_meger

# Conflicts:
#	zq-erp/src/main/resources/config/application.properties
11 files modified
93 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/util/QueryUtil.java 17 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java 22 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/order/serviceOrderDetail.html 18 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java 7 ●●●●● diff | view | raw | blame | history