parent: 79e813 | patch | commitdiff
Helius
2020-07-31 829d77f7145514d67d957ad54dbef854440f77d3
refs
author Helius <wangdoubleone@gmail.com>
Friday, July 31, 2020 17:05 +0800
committer Helius <wangdoubleone@gmail.com>
Friday, July 31, 2020 17:05 +0800
commit829d77f7145514d67d957ad54dbef854440f77d3
tree 607e155d2db89c8877b70d5cb54a27f52e4ca8ea tree | zip | gz
parent 79e81397b1bf90e6833db97e4944f8fe7801a669 view | diff
38d37033e6faa269cfc63e2e584bde7f48125d22 view | diff 
fix conflect
8 files modified
1 files added
145 ■■■■■ changed files
src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/documentary/controller/TraderController.java 34 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/documentary/dao/FollowFollowerOrderRelationDao.java 5 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/documentary/entity/FollowTraderInfoEntity.java 7 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/documentary/service/DocumentaryService.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java 65 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/documentary/vo/MyFollowOrderVo.java 10 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/documentary/FollowFollowerOrderRelationDao.xml 16 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/documentary/FollowFollowerProfitDao.xml 4 ●●●●● diff | view | raw | blame | history