yixian
|
bb4d16bdba
|
settlement mail content
|
6 years ago |
yixian
|
829a05a328
|
settlement mail content
|
6 years ago |
yixian
|
ac75df6ead
|
apply interceptor
|
6 years ago |
taylor.dang
|
40f3e9368a
|
[Y] 风控商户检测
|
6 years ago |
taylor.dang
|
9b5a21b937
|
fix
|
6 years ago |
kira
|
4639d1b530
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
6 years ago |
kira
|
09607c104d
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
kira
|
74b0bbce8d
|
Merge branch 'hotfix_hfSettle' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/citypartner/web/CityPartnerRegisterController.java
|
6 years ago |
kira
|
37256a6f15
|
Merge branch 'hotfix_hfSettle'
|
6 years ago |
taylor.dang
|
ea7846eb38
|
[Y] fix
|
6 years ago |
taylor.dang
|
9f45114d96
|
[Y] 风控商户检测
|
6 years ago |
taylor.dang
|
b78c2c9f09
|
fix risk
|
6 years ago |
yangkai
|
d6a2853a4d
|
添加is_valid条件
|
6 years ago |
taylor.dang
|
e430d7804d
|
fix dashboard今日数据
|
6 years ago |
yangkai
|
5c55b61fb2
|
控制台数据显示修复
|
6 years ago |
kira
|
6de18d4324
|
update
|
6 years ago |
taylor.dang
|
fd4cd788d9
|
compare
|
6 years ago |
kira
|
74835ee47d
|
hf settle
|
6 years ago |
kira
|
74e059180d
|
hf settle
|
6 years ago |
yangkai
|
63856ad85b
|
交易商户数量变化bug修复
|
6 years ago |
kira
|
34dcda4ec1
|
Merge branch 'hotfix2'
|
6 years ago |
kira
|
62d887cabd
|
conflict
|
6 years ago |
kira
|
dff33de344
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
6 years ago |
kira
|
1ac4662220
|
conflict
|
6 years ago |
kira
|
833352386f
|
Merge branch 'hotfix2' into develop
|
6 years ago |
kira
|
6cd26407b3
|
update
|
6 years ago |
yangkai
|
f416d0800f
|
添加验证码验证
|
6 years ago |
yixian
|
ef11bc9de5
|
apply interceptor
|
6 years ago |
yixian
|
0816c2a0b9
|
apply interceptor
|
6 years ago |
kira
|
cb39764a9f
|
Merge branch 'hotfix2' into develop
|
6 years ago |
kira
|
b8d2dcf8c6
|
update
|
6 years ago |
yixian
|
d8c907e75b
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
yixian
|
b1e967695e
|
disable city partner
|
6 years ago |
kira
|
7cc6a73994
|
Merge branch 'hotfix_postpone' into develop
|
6 years ago |
kira
|
faa2fcd7f8
|
remove client postpone transaction
|
6 years ago |
kira
|
0e1ecd239d
|
Merge branch 'hotfix_custom' into develop
|
6 years ago |
kira
|
4143d12f7b
|
update
|
6 years ago |
kira
|
d5e292ce41
|
Merge branch 'hotfix_custom' into develop
|
6 years ago |
kira
|
3fb3c7b7e8
|
update
|
6 years ago |
kira
|
6ad7cf9342
|
Merge branch 'hotfix_custom'
|
6 years ago |
kira
|
683a7f8d98
|
Merge branch 'hotfix_custom' into develop
|
6 years ago |
kira
|
194e8e9e09
|
rollback
|
6 years ago |
kira
|
7db3b8875a
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
kira
|
dd23152894
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
6 years ago |
kira
|
227fdeab34
|
Merge branch 'hotfix_custom' into develop
|
6 years ago |
kira
|
5e065b9e61
|
update
|
6 years ago |
taylor.dang
|
5fce139e12
|
fix 账单码查询时间
|
6 years ago |
eason
|
32c1221486
|
encourage config params add operator role permission
|
6 years ago |
eason
|
01d41922c2
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
eason
|
7cae803907
|
Merge branch 'hotfix1' into develop
|
6 years ago |
eason
|
74afa68391
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
eason
|
8b33b85037
|
fix refund bug "input String"
|
6 years ago |
luoyang14z7
|
9fca669d45
|
fix : ali for excel
|
6 years ago |
luoyang14z7
|
90da2a1c1c
|
fix : ali for excel
|
6 years ago |
kira
|
f21b52a42f
|
Merge branch 'hotfix' into develop
|
6 years ago |
kira
|
f682caf7cb
|
update
|
6 years ago |
eason
|
010bd56a61
|
fix
|
6 years ago |
kira
|
8031e87fcf
|
Merge branch 'hotfix_custom' into develop
|
6 years ago |
kira
|
26eb3f8241
|
modify Custom
|
6 years ago |
taylor.dang
|
9b9b430dfa
|
修改翼支付清算开始日期
|
6 years ago |
kira
|
e51b6af17d
|
Merge branch 'hotfix' into develop
|
6 years ago |
kira
|
bf25295eab
|
update
|
6 years ago |
kira
|
560cb9a115
|
Merge branch 'hotfix' into develop
|
6 years ago |
kira
|
afc17eb0fa
|
add ctrip active
|
6 years ago |
kira
|
bbb6d23d36
|
Merge branch 'hotfix' into develop
|
6 years ago |
kira
|
d1cd353b53
|
updae
|
6 years ago |
kira
|
facbfecb82
|
Merge branch 'hotfix' into develop
|
6 years ago |
kira
|
c41d8ad453
|
update
|
6 years ago |
kira
|
da0e7c5c84
|
Merge branch 'hotfix' into develop
|
6 years ago |
kira
|
d1be4005f8
|
add ctrip active
|
6 years ago |
kira
|
17b3f99880
|
Merge branch 'hotfix' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientModifySupportImpl.java
|
6 years ago |
kira
|
5251d2fde3
|
fixbug
|
6 years ago |
kira
|
eb4ffa947d
|
update
|
6 years ago |
kira
|
b3d8318097
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
6 years ago |
kira
|
a328af2b7a
|
tmp
|
6 years ago |
kira
|
3ea9756383
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
yuan
|
2dd9347ab8
|
Merge branch '8/7' into develop
|
6 years ago |
yuan
|
1586860791
|
fix bug
|
6 years ago |
kira
|
2b017b6896
|
Merge branch 'hotfix' into develop
|
6 years ago |
kira
|
8edeaa5152
|
update
|
6 years ago |
kira
|
d1b3de8b87
|
add senior partner prize
|
6 years ago |
kira
|
9ba62f3e33
|
Merge branch 'hotfix' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/custom/core/impl/CustomServiceImpl.java
|
6 years ago |
kira
|
2c42ec0ef9
|
custom add resend
|
6 years ago |
kira
|
5a218b2090
|
tmp
|
6 years ago |
yixian
|
19fa8e9617
|
custom query
|
6 years ago |
yixian
|
763a2a9e93
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
yixian
|
1473f89c0c
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
yixian
|
b41a08e45a
|
custom query
|
6 years ago |
yuan
|
9553f8e61d
|
sys_org add state
|
6 years ago |
yuan
|
89a183e35f
|
Merge branch '8/3' into develop
|
6 years ago |
yuan
|
07ef3dd582
|
fix html
|
6 years ago |
kira
|
90b7c356d1
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
6 years ago |
kira
|
762a926d5a
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
kira
|
8bd679bd3d
|
Merge branch 'hotfix' into develop
|
6 years ago |
kira
|
a51df7da06
|
fixbug
|
6 years ago |
kira
|
bd63e07eb5
|
Merge branch 'hotfix' into develop
|
6 years ago |
kira
|
001ea48494
|
add log
|
6 years ago |
eason
|
5dfcefeeaa
|
fix prize
|
6 years ago |
eason
|
630e7940d5
|
fix prize
|
6 years ago |
eason
|
876b8cc46e
|
fix
|
6 years ago |
eason
|
611a4eb646
|
fix
|
6 years ago |
eason
|
376687f25b
|
fix bd prize
|
6 years ago |
eason
|
2627482fba
|
fix
|
6 years ago |
eason
|
04b3b7665a
|
bd
|
6 years ago |
kira
|
07d7995a6a
|
update
|
6 years ago |
yuan
|
a9308167d7
|
fix bug
|
6 years ago |
eason
|
010b8b63da
|
Merge branch 'hotfix_prize' into develop
|
6 years ago |
eason
|
c8657980cf
|
优化 BD提成查询
|
6 years ago |
yuan
|
e2f4073169
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
yuan
|
6058479d25
|
fix~
|
6 years ago |
kira
|
96298f95d4
|
Merge branch 'hotfix' into develop
|
6 years ago |
kira
|
5e0fa354b2
|
hide hf exchange rate
|
6 years ago |
kira
|
f461b3bfc4
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
kira
|
e73790d84c
|
Merge branch 'hotfix' into develop
|
6 years ago |
kira
|
3307ce25b7
|
fixbug
|
6 years ago |
yuan
|
8af00b8798
|
fix bug
|
6 years ago |
kira
|
248d9d43ee
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
kira
|
ea8025ff3d
|
Merge branch 'hotfix' into develop
|
6 years ago |
kira
|
5a0d041f9c
|
fixbug
|
6 years ago |
yuan
|
624022a67d
|
fix bug
|
6 years ago |
eason
|
154faf131b
|
fix
|
6 years ago |
kira
|
07d5402ae2
|
modify sms sender
|
6 years ago |
kira
|
f4c4e7a6e1
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
kira
|
d50b476077
|
update
|
6 years ago |
kira
|
ab97b9a2ee
|
update
|
6 years ago |
yuan
|
9e0af4706f
|
fix bug
|
6 years ago |
yuan
|
35ae7dcc24
|
自主进件contact_phone加"+61"
|
6 years ago |
kira
|
125e6f9adc
|
update
|
6 years ago |
kira
|
5cfea84117
|
add log
|
6 years ago |
kira
|
e5a7a14d89
|
fixbug
|
6 years ago |
kira
|
fcb9a0ae6f
|
update
|
6 years ago |
kira
|
857c4517a8
|
tmp
|
6 years ago |
kira
|
d742d4b3cf
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
kira
|
5ad8390bc9
|
update
|
6 years ago |
yuan
|
777899087c
|
增加支付宝支付限额
|
6 years ago |
kira
|
3064b64ecb
|
fixbug
|
6 years ago |
kira
|
1bc4c2d6d9
|
update
|
6 years ago |
luoyang14z7
|
091fb0c830
|
fix : PartnerPermiss
|
6 years ago |
kira
|
0c2afb0c81
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
kira
|
a889d06770
|
update
|
6 years ago |
yixian
|
e11a5b4d92
|
settlement detail
|
6 years ago |
yuan
|
1eb2326941
|
Merge branch '7/30'
|
6 years ago |
yuan
|
50a5858aa6
|
Merge branch '7/30' into develop
|
6 years ago |
yuan
|
918f20359d
|
fix html
|
6 years ago |
eason
|
57fc6a1ac1
|
fix wechat sign
|
6 years ago |
yuan
|
655acd41e3
|
fix html
|
6 years ago |
yuan
|
b44cca66dd
|
Merge branch '7/30' into develop
|
6 years ago |
yuan
|
968ce024e7
|
fix html
|
6 years ago |
kira
|
7cea42ba44
|
update
|
6 years ago |
kira
|
06967690b9
|
fixbug
|
6 years ago |