luoyang
|
33a17233de
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
luoyang
|
2867b8e746
|
add 增值服务财务报表
|
5 years ago |
AlanFenng
|
60a5178c96
|
upgrade 优化卡支付表单
|
5 years ago |
yixian
|
c857f05dbb
|
update cardpay ui
|
5 years ago |
|
yixian
|
2b61487add
|
update cardpay ui
|
5 years ago |
|
yixian
|
432dc23671
|
update cardpay ui
|
5 years ago |
|
yixian
|
7f2ce325da
|
update cardpay ui
|
5 years ago |
|
yixian
|
4f1f292f08
|
update cardpay ui
|
5 years ago |
|
yixian
|
0aa4843387
|
update cardpay ui
|
5 years ago |
|
yixian
|
1dca324d35
|
update cardpay ui
|
5 years ago |
|
yixian
|
0a0064b53e
|
update cardpay ui
|
5 years ago |
|
yixian
|
dc342ced84
|
js update
|
5 years ago |
|
yixian
|
2713b90c13
|
js update
|
5 years ago |
|
yixian
|
04c052b75f
|
build: 2.1.7
|
5 years ago |
|
yixian
|
5f381ae17e
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
yixian
|
1842bb0cea
|
nginx update
|
5 years ago |
|
luoyang
|
4e339e750d
|
fastjson 2.1.6
|
5 years ago |
|
luoyang
|
104958dc22
|
fastjson 1.2.62->1.2.68
|
5 years ago |
|
luoyang
|
191d676ddb
|
fastjson 1.2.62->1.2.68
|
5 years ago |
|
luoyang
|
4afe778d28
|
delete properties
|
5 years ago |
|
luoyang
|
545be6818f
|
fix merge
|
5 years ago |
|
luoyang
|
02ae04f3ec
|
Merge branch 'develop'
# Conflicts:
# pom.xml
# src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java
# src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceTokenMapper.java
# src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
# src/main/resources/application.properties
|
5 years ago |
|
luoyang
|
6231b2a6bf
|
update 2.1.2
|
5 years ago |
|
yixian
|
efccef2df8
|
build: 2.1.3
|
5 years ago |
|
yixian
|
dd5f00ec69
|
build: 2.1.2 rpaysvc
|
5 years ago |
|
yixian
|
f426f8c354
|
build: 2.1.1 integration
|
5 years ago |
|
yixian
|
856eecac74
|
Merge branch 'develop-2.0' into develop
# Conflicts:
# pom.xml
# src/main/java/au/com/royalpay/payment/manage/mappers/log/ClearingDetailMapper.java
# src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceTokenMapper.java
# src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientIncrementalMapper.java
# src/main/resources/application-dev.properties
# src/main/resources/application-local.properties
# src/main/resources/application.properties
|
5 years ago |
|
luoyang
|
62748d309f
|
add rservice app notify
|
5 years ago |
|
luoyang
|
f1b9f8d9be
|
add rservice app notify
|
5 years ago |
|
luoyang
|
59dff3dc39
|
add rservice app notify
|
5 years ago |
|
luoyang
|
dd8bf3cb20
|
add rservice app notify
|
5 years ago |
|
luoyang
|
372a4346bb
|
add rservice app notify
|
5 years ago |
|
luoyang
|
f85aec853c
|
add 更新最新合同模版
|
5 years ago |
|
luoyang
|
ca9f244261
|
add 更新最新合同模版
|
5 years ago |
|
luoyang
|
4030e427e8
|
fix rate display
|
5 years ago |
|
luoyang
|
9f7318c3b5
|
fix rate display
|
5 years ago |
|
luoyang
|
f0ca9373d2
|
fix incremental rate display
|
5 years ago |
|
luoyang
|
3f21fe319c
|
fix incremental rate display
|
5 years ago |
|
luoyang
|
9babac186b
|
Merge branch 'develop'
|
5 years ago |
|
luoyang
|
aef3a80bba
|
add 推送通知test
|
5 years ago |
|
luoyang
|
b80d3e8f0f
|
fix incremental surcharge rate
|
5 years ago |
|
luoyang
|
83b0297b85
|
fix incremental surcharge rate
|
5 years ago |
|
luoyang
|
9325ce6234
|
fix incremental surcharge rate
|
5 years ago |
|
luoyang
|
c56245eac8
|
fix incremental surcharge rate
|
5 years ago |
|
luoyang
|
7005ca9ee2
|
fix incremental surcharge rate
|
5 years ago |
|
luoyang
|
a8a5fd2a1d
|
fix incremental surcharge rate
|
5 years ago |
|
luoyang
|
884be1342f
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
luoyang
|
e32ff20b40
|
add 增值服务交易流水
|
5 years ago |
|
luoyang
|
92caef34c2
|
fix dev.properties
|
5 years ago |
|
luoyang
|
65e5378d1c
|
fix transaction 时间选择
|
5 years ago |
