parent: 1443f8 | patch | commitdiff
jyy
2021-04-09 f96ad6ec73b3da7df5c08471f0d567d46fc767e8
refs
author jyy <935090232@qq.com>
Friday, April 9, 2021 14:34 +0800
committer jyy <935090232@qq.com>
Friday, April 9, 2021 14:34 +0800
commitf96ad6ec73b3da7df5c08471f0d567d46fc767e8
tree 3b048e5226130d4d906949f998756f7847c820c7 tree | zip | gz
parent 1443f8eb9f3b001e84f101852aa5f6ec7f49f4c9 view | diff
7ae4a28d6ef3c060170b1ce35f7aece25dd2780c view | diff 
Merge remote-tracking branch 'origin/score_shop' into score_shop
6 files modified
14 files added
1538 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/activity/action/ActivitySignWriteoffAction.java 74 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignWriteoffDao.java 26 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/dto/SignWriteoffDto.java 17 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/dto/SignWriteoffListDto.java 21 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/dto/WriteoffCodeSubmitDto.java 20 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignWriteoff.java 121 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignAwardSetService.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignWriteoffService.java 125 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/vo/SignWriteoffListVo.java 77 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/vo/SignWriteoffVo.java 45 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/vo/ZjrVo.java 19 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java 33 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/db/increment/签到活动.sql 41 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml 93 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-logistics-info.html 291 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-receive.html 24 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff-info.html 198 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff.html 293 ●●●●● diff | view | raw | blame | history