parent: b8d50f | patch | commitdiff
Helius
2021-04-12 0df561aa2c21423f1d4bd78040c4c3507b89e259
refs
author Helius <wangdoubleone@gmail.com>
Monday, April 12, 2021 18:11 +0800
committer Helius <wangdoubleone@gmail.com>
Monday, April 12, 2021 18:11 +0800
commit0df561aa2c21423f1d4bd78040c4c3507b89e259
tree 7f6e62c48aaa5fcf8bb78fb6e497c09e85b57f22 tree | zip | gz
parent b8d50f6ad9d1ab407e5b2a6867cf47bc4640a43c view | diff
1b2f30bf6e23dd06bb6b667fe0297646d6606960 view | diff 
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
19 files modified
2 files added
388 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/action/ActivitySignWriteoffAction.java 15 ●●●●● diff | view | raw | blame | history
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/dto/LogisticsSubmitDto.java 28 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/dto/SignWriteoffListDto.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignReceiveRecord.java 13 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignWriteoff.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignWriteoffService.java 94 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/vo/LogisticsVo.java 18 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/vo/SignWriteoffVo.java 25 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxMoneyCardUseAction.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java 26 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopDeliveryInfo.java 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/db/increment/签到活动.sql 16 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseFlowDao.xml 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopDeliveryInfoDao.xml 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-logistics-info.html 93 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff.html 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/common/login.html 2 ●●●●● diff | view | raw | blame | history