parent: 06f0fb | patch | commitdiff
jyy
2021-04-20 f50e081f650eb067cce44fce3db64a237fde145b
refs
author jyy <935090232@qq.com>
Tuesday, April 20, 2021 13:44 +0800
committer jyy <935090232@qq.com>
Tuesday, April 20, 2021 13:44 +0800
commitf50e081f650eb067cce44fce3db64a237fde145b
tree 1242a393229c279afc3eaab1e59c0003c1704456 tree | zip | gz
parent 06f0fb09a61e16df895dc9feebea8ddd24d14db5 view | diff
c57c5f9843dcd99d908aa3b6bddb0c3793ebf3e9 view | diff 
Merge remote-tracking branch 'origin/score_shop' into score_shop
6 files modified
519 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignWriteoffDao.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignWriteoffService.java 137 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java 98 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SeeAwardTextVo.java 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/FenxiaoSoreInitTest.java 266 ●●●●● diff | view | raw | blame | history