parent: caef53 | patch | commitdiff
gao
2020-05-25 73699775f5546177ce71e3bae33d83a8aa346793
refs
author gao <gaoleox@163>
Monday, May 25, 2020 11:28 +0800
committer gao <gaoleox@163>
Monday, May 25, 2020 11:28 +0800
commit73699775f5546177ce71e3bae33d83a8aa346793
tree 7fa0baffda8401b717633d7b4f7c0c89889771a9 tree | zip | gz
parent caef53a16aff2baadad1c5f49e80a915ba97f674 view | diff
d698695a783ed41de2cfffc04aa4845865a4259c view | diff 
Merge branch 'master' of
https://chonggaoxiao:xcg523511090712@gitee.com/chonggaoxiao/new_excoin.git

Conflicts:
	src/main/java/com/xcong/excoin/modules/home/mapper/MemberQuickBuySaleEntityMapper.java
11 files modified
18 files added
912 ■■■■■ changed files
src/main/java/com/xcong/excoin/common/enumerates/MemberWalletCoinEnum.java 28 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/configurations/WebMvcConfig.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/configurations/security/TokenFilter.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java 33 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java 61 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/dao/MemberSelectSymbolsDao.java 14 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/dao/OrderCoinDao.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/dao/OrderCoinDealDao.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/dao/platform/TradeSettingDao.java 22 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/entity/OrderCoinsDealEntity.java 19 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/entity/OrderCoinsEntity.java 75 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/entity/PlatformLeverageSettingEntity.java 41 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/entity/PlatformSymbolsSku.java 32 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/entity/PlatformTradeSettingEntity.java 59 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/parameter/dto/InOrderCoinDto.java 27 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/parameter/dto/SubmitSalesWalletCoinOrderDto.java 32 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberWalletCoinInfoVo.java 81 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberWalletCoinVo.java 17 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/service/CoinService.java 6 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/service/OrderCoinService.java 16 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java 120 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java 109 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/home/mapper/MemberQuickBuySaleEntityMapper.java 6 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/entity/MemberSelectSymbolsEntity.java 29 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/test/controller/TestUserController.java 5 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/utils/SpringContextHolder.java 2 ●●●●● diff | view | raw | blame | history
src/main/resources/application.yml 2 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/member/MemberSelectSymbolsDao.xml 9 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/platform/TradeSettingDao.xml 35 ●●●●● diff | view | raw | blame | history