parent: bc758a | patch | commitdiff
jyy
2021-04-20 fa791f7796c1546b1329b52a3de8d753915cb4d5
refs
author jyy <935090232@qq.com>
Tuesday, April 20, 2021 00:24 +0800
committer jyy <935090232@qq.com>
Tuesday, April 20, 2021 00:24 +0800
commitfa791f7796c1546b1329b52a3de8d753915cb4d5
tree d4a3efe0bdc250489641729173ef7834657e3ffe tree | zip | gz
parent bc758aa3ab827c1b11f014a40355beb67eb6c1cc view | diff
b37a7016be0c76736be2dca81538ce6cb7a52673 view | diff 
Merge remote-tracking branch 'origin/score_shop' into score_shop
7 files added
25 files modified
497 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignRecordDao.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignReceiveRecord.java 6 ●●●●● 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/activity/service/ActivitySignWriteoffService.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java 15 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java 15 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java 104 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/ActivitySignRecordVo.java 39 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignAwardListVo.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignBasicInfoVo.java 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignRecordDao.xml 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/static/images/sign/jisumiaosha.png diff | view | raw | blame | history
zq-erp/src/main/resources/static/images/sign/meiriqiandao.png diff | view | raw | blame | history
zq-erp/src/main/resources/static/images/sign/shalonghuodong.png diff | view | raw | blame | history
zq-erp/src/main/resources/static/images/sign/signButton.png diff | view | raw | blame | history
zq-erp/src/main/resources/static/images/sign/signHead.png diff | view | raw | blame | history
zq-erp/src/main/resources/static/images/sign/tiantianpingtuan.png diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html 16 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-logistics-info.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-update.html 109 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff-info.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html 62 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/servicceAddForm.html 28 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yyServiceAddForm.html 29 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/instore/store-list-pl.html 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/store/projServiceStartpl-list.html 19 ●●●●● diff | view | raw | blame | history