本地新币代码
parent: 8ceb6c | patch | commitdiff
zj
2025-05-02 01830e44921b187b448d8cce9c9a46b9ad55af43
refs
author zj <1772600164@qq.com>
Friday, May 2, 2025 19:48 +0800
committer zj <1772600164@qq.com>
Friday, May 2, 2025 19:48 +0800
commit01830e44921b187b448d8cce9c9a46b9ad55af43
tree 19f73970ca2d805b2e6d8025bd350d3568b306df tree | zip | gz
parent 8ceb6cd5ba9d7f347f2070a3967f31cc070ef4ef view | diff
1e24ff3195adcd0807c110f2c3919bba0d847934 view | diff 
Merge remote-tracking branch 'origin/bingx' into bingx

# Conflicts:
#	src/main/java/project/web/api/ChannelBlockchainController.java
#	src/main/java/project/web/api/UserWalletAddressController.java
13 files modified
203 ■■■■■ changed files
src/main/java/project/contract/internal/ContractOrderServiceImpl.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/project/exchange/internal/ExchangeApplyOrderServiceImpl.java 15 ●●●●● diff | view | raw | blame | history
src/main/java/project/futures/internal/FuturesOrderLocalServiceImpl.java 12 ●●●●● diff | view | raw | blame | history
src/main/java/project/futures/internal/FuturesOrderServiceImpl.java 21 ●●●●● diff | view | raw | blame | history
src/main/java/project/hobi/internal/HobiDataServiceImpl.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/project/news/internal/NewsServiceImpl.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/project/user/internal/QRGenerateServiceImpl.java 17 ●●●●● diff | view | raw | blame | history
src/main/java/project/web/admin/AdminNewsController.java 3 ●●●●● diff | view | raw | blame | history
src/main/java/project/web/api/ChannelBlockchainController.java 47 ●●●●● diff | view | raw | blame | history
src/main/java/project/web/api/NewOnlineChatController.java 12 ●●●●● diff | view | raw | blame | history
src/main/java/project/web/api/RealtimeController.java 11 ●●●●● diff | view | raw | blame | history
src/main/java/project/web/api/UserWalletAddressController.java 51 ●●●●● diff | view | raw | blame | history
src/main/resources/config/email.properties 4 ●●●●● diff | view | raw | blame | history