parent: 8b6823 | patch | commitdiff
zainali5120
2020-05-31 a2d9bd16ac1106489572a5f7d8d70e1086d5406d
refs
author zainali5120 <512061637@qq.com>
Sunday, May 31, 2020 21:19 +0800
committer zainali5120 <512061637@qq.com>
Sunday, May 31, 2020 21:19 +0800
commita2d9bd16ac1106489572a5f7d8d70e1086d5406d
tree eb7e9f5a10a784361ce92caa8476a9a04b2add1d tree | zip | gz
parent 8b6823a12dbddd130a822f013db18a47d17381a5 view | diff
503d3b2184c5f8c298d2867e64c5b3a5b6460e5f view | diff 
Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java
5 files modified
137 ■■■■■ changed files
src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java 20 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/mapper/ContractEntrustOrderEntityMapper.java 3 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/mapper/ContractHoldOrderEntityMapper.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java 104 ●●●●● diff | view | raw | blame | history