yixian
|
607adc4f33
|
fixed ui bug
|
4 years ago |
|
yixian
|
c974184995
|
fixed ui bug
|
4 years ago |
|
yixian
|
28e436a978
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
ae3359dcc4
|
fixed ui bug
|
4 years ago |
|
yixian
|
970136d27a
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
571c149768
|
org default client profile setters
|
4 years ago |
|
yixian
|
ee1a11cbe6
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yixian
|
fb8908a026
|
org default client profile setters
|
4 years ago |
dulingling
|
013713bc5d
|
upd:修复商户自动续费有效期时间问题
|
4 years ago |
|
yixian
|
483367cf45
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
a05d93d48d
|
yesterday trans analysis
|
4 years ago |
|
yixian
|
a18d743ece
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
yixian
|
97d66f1554
|
hotfix-modify min settle
|
4 years ago |
taylor.dang
|
df3d19a0dd
|
Merge branch 'develop'
|
4 years ago |
|
taylor.dang
|
39ee9a1505
|
[Y] 修复审核商户报错:无账户导致异常
|
4 years ago |
|
taylor.dang
|
bbb73d11bc
|
fix
|
4 years ago |
|
taylor.dang
|
cd857ee59c
|
fix
|
4 years ago |
|
yixian
|
e67213fce2
|
fix ui
|
4 years ago |
|
yixian
|
466accf5cc
|
fix ui
|
4 years ago |
|
yixian
|
3ef152b35b
|
fix ui
|
4 years ago |
|
yixian
|
436289f86a
|
fix warnings
|
4 years ago |
|
yixian
|
9d16507210
|
Merge branch 'develop'
# Conflicts:
# pom.xml
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
|
4 years ago |
|
yixian
|
17083b8004
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yixian
|
271df89cac
|
起结金额
|
4 years ago |
|
dulingling
|
8ff744f213
|
upd:平台收支统计年份修复
|
4 years ago |
|
dulingling
|
ab55a070b9
|
upd:平台收支统计年份修复
|
4 years ago |
|
dulingling
|
a52ce2ff7e
|
upd:交易流水汇总信息，统计交易流水数量字段变更
|
4 years ago |
|
yixian
|
99126a7e73
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yixian
|
3465581d75
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
yixian
|
846414fca7
|
自动延期调整
|
4 years ago |
|
dulingling
|
6f9d525db4
|
upd:卡申请-合同生成：解析境外/境内费率格式
|
4 years ago |
|
dulingling
|
6c4280deb5
|
upd:卡申请-合同生成：解析境外/境内费率格式
|
4 years ago |
|
dulingling
|
7184bec9d3
|
upd:卡申请-合同生成：解析境外/境内费率格式
|
4 years ago |
|
dulingling
|
3a6a72a418
|
upd:卡申请-合同生成：解析境外/境内费率格式
|
4 years ago |
|
yixian
|
b067ee39a9
|
split companies in bttps file
|
4 years ago |
|
yixian
|
1767cb98e9
|
addressInfo in bttps file 增加容错
|
4 years ago |
dell
|
a46e955fbe
|
修改登录后拿不到权限
|
4 years ago |
|
yixian
|
eaa934d3f9
|
rate config
|
4 years ago |
|
yixian
|
965bf77d63
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yixian
|
371a17632a
|
rate config
|
4 years ago |
|
dulingling
|
9637a9366d
|
upd:商户数据分析cardpaymenr数据异常修复
|
4 years ago |
|
dulingling
|
11352a4525
|
Upd:修复商户数据分析-交易分布cardpayment数据显示异常问题
|
4 years ago |
|
yixian
|
c6c4c0eedf
|
clean days
|
4 years ago |
|
yixian
|
8a7ff2322a
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yixian
|
38ee861d03
|
holiday config
|
4 years ago |
|
dell
|
3062338db3
|
registered office address
|
4 years ago |
|
yixian
|
5899bcb4d2
|
ui update
|
4 years ago |
|
yixian
|
dca34577c2
|
log ato output
|
4 years ago |
|
yixian
|
2161d3ca1d
|
reset ato output
|
4 years ago |
|
yixian
|
e713c2128a
|
new rate config bug for card payment
|
4 years ago |
|
yixian
|
d9e5a2f3cd
|
Merge branch 'master' into develop
|
4 years ago |
|
yixian
|
56210da57d
|
holiday config
|
4 years ago |
|
yixian
|
c9affaa158
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
2f87d50253
|
2.2.5 upgrade
|
4 years ago |
|
yixian
|
30051b7dbf
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
9f46f7d02b
|
2.2.5 upgrade
|
4 years ago |
|
yixian
|
89b58523b1
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
55bbff14e3
|
ato report
|
4 years ago |
|
yixian
|
61ca60abd6
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
0bb3a1c687
|
syn progress
|
4 years ago |
|
yixian
|
020fcf4e88
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
680cf5b070
|
ato report
|
4 years ago |
|
yixian
|
6b10596c8b
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
cac15eaf17
|
ui update
|
4 years ago |
|
yixian
|
d15a505dba
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
4 years ago |
|
yixian
|
eee0da230b
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yixian
|
cd858be89a
|
ato report task
|
4 years ago |
|
dulingling
|
afb05d299d
|
upd:商户地址信息添加标注
|
4 years ago |
|
yixian
|
53797f8654
|
settle tasks api
|
4 years ago |
|
yixian
|
5476012b9a
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
89bbdc5c6e
|
fix ui bug
|
4 years ago |
|
yixian
|
e0a549809f
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
5a2533c289
|
synchronize priority weekends
|
4 years ago |
|
yixian
|
5efa44b141
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
85b3b993bd
|
synchronize priority weekends
|
4 years ago |
|
yixian
|
1655c779f9
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
86eb49834e
|
ui improve for settle_tasks
|
4 years ago |
|
yixian
|
b33e8d5f12
|
ui improve for settle_tasks
|
4 years ago |
|
yixian
|
4e01a8f2a3
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
acf013e712
|
fix ui bugs
|
4 years ago |
|
yixian
|
dab9d8c30c
|
fix ui bugs
|
4 years ago |
|
yixian
|
8bd0a5ae58
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
19aaed8cf7
|
fix ui bugs
|
4 years ago |
|
yixian
|
587fca45ca
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
8b05c0328f
|
fix ui bugs
|
4 years ago |
|
yixian
|
a57e66ca3f
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
0113d7d021
|
fix ui bugs
|
4 years ago |
|
yixian
|
8c2e73d9ea
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
aec5e880e4
|
fix ui bugs
|
4 years ago |
|
yixian
|
b51ce67fb9
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
400722149b
|
fix ui bugs
|
4 years ago |
|
yixian
|
3c031741fb
|
fix ui bugs
|
4 years ago |
|
yixian
|
a169d962d1
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
1079f9df9d
|
fix ui bugs
|
4 years ago |
|
yixian
|
473dd17283
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
1d62c2cad3
|
ui update
|
4 years ago |
|
yixian
|
83dc0c61bd
|
ui update
|
4 years ago |
|
yixian
|
ad002c1365
|
homepage link
|
4 years ago |
|
yixian
|
d689788a26
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
8e25f25888
|
startup error
|
4 years ago |
