parent: 6f9a0c | patch | commitdiff
jyy
2021-04-07 21db21a114356e0704a3483c1a3f22b96ea6658b
refs
author jyy <935090232@qq.com>
Wednesday, April 7, 2021 16:26 +0800
committer jyy <935090232@qq.com>
Wednesday, April 7, 2021 16:26 +0800
commit21db21a114356e0704a3483c1a3f22b96ea6658b
tree 98e11640e0fd7fb2e1059ecbba4d30d7e8e4ea3c tree | zip | gz
parent 6f9a0cdb6360ff80818ce9ac947fb686e3045f8a view | diff
894cde4d057b5805177a8af046a97580030de066 view | diff 
Merge remote-tracking branch 'origin/score_shop' into score_shop

# Conflicts:
#	zq-erp/src/test/java/com/matrix/FenxiaoSoreInitTest.java
7 files modified
1 files added
338 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignAwardSet.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java 77 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignBasicInfoVo.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignSuccessVo.java 150 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-update.html 29 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html 24 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/FenxiaoSoreInitTest.java 48 ●●●●● diff | view | raw | blame | history