parent: 4d656d | patch | commitdiff
jyy
2021-04-08 9dfddb73a329af5afb72c47ba0fd500962f78321
refs
author jyy <935090232@qq.com>
Thursday, April 8, 2021 19:13 +0800
committer jyy <935090232@qq.com>
Thursday, April 8, 2021 19:13 +0800
commit9dfddb73a329af5afb72c47ba0fd500962f78321
tree 27602ca1a90e661654fed03e2e940008df5f5ce7 tree | zip | gz
parent 4d656d6adf7118982a353f6872ed207063c354e8 view | diff
8fb4d7c5df2cd967272f6cecfe72401b596eb182 view | diff 
Merge remote-tracking branch 'origin/score_shop' into score_shop
8 files modified
167 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignRecordDao.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorktimeServiceImpl.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java 71 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignRecordDao.xml 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml 66 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-update.html 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html 6 ●●●●● diff | view | raw | blame | history