parent: 7203c0 | patch | commitdiff
jyy
2021-04-06 12990a5138e3fa8874a601bfb784a2b1147f0f24
refs
author jyy <935090232@qq.com>
Tuesday, April 6, 2021 11:53 +0800
committer jyy <935090232@qq.com>
Tuesday, April 6, 2021 11:53 +0800
commit12990a5138e3fa8874a601bfb784a2b1147f0f24
tree d04b02601d21e09825ecf65c298f0757e3e7629d tree | zip | gz
parent 7203c0843f54cf677ee5c0259bb2e26be54efb42 view | diff
85d8a93709e4edd38e2b4900b107ac1d83711f68 view | diff 
Merge remote-tracking branch 'origin/score_shop' into score_shop
6 files modified
2 files added
469 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/activity/dto/UpdateSignAwardSetDto.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignAwardSetService.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java 41 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html 67 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-update.html 265 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/FenxiaoSoreInitTest.java 78 ●●●●● diff | view | raw | blame | history