parent: a13a93 | patch | commitdiff
xiaoyong931011
2021-04-12 c18037dc5de7f67175c2cf80cd04761d198739b5
refs
author xiaoyong931011 <15274802129@163.com>
Monday, April 12, 2021 19:48 +0800
committer xiaoyong931011 <15274802129@163.com>
Monday, April 12, 2021 19:48 +0800
commitc18037dc5de7f67175c2cf80cd04761d198739b5
tree 4c6a5af40a02e8821a08278e5a7b5f9fb1943407 tree | zip | gz
parent a13a93a493e7e94e28b2225c26e7e13b52d3288c view | diff
f1a565cbcbb1ab672fdbc57953ce6d8298a159fe view | diff 
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
11 files modified
2 files added
324 ■■■■■ 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/app/action/ApiServiceOrderAction.java 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/actions/MultipleFileUploadAction.java 169 ●●●●● 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/dao/SysProjUseDao.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/SysProjUseService.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxMoneyCardUseAction.java 2 ●●●●● 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/hive/SysProjUseDao.xml 74 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/TcProjTest.java 33 ●●●●● diff | view | raw | blame | history