wangning
|
05ef9e47ca
|
Merge branch 'develop'
|
7 years ago |
|
wangning
|
6616a10add
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
cdd9f0b700
|
update mongo db name
|
7 years ago |
|
wangning
|
83800853f3
|
update
|
7 years ago |
|
wangning
|
96d18a6171
|
update
|
7 years ago |
|
wangning
|
3f4b456e87
|
update
|
7 years ago |
|
wangning
|
fdbf906996
|
update
|
7 years ago |
|
wangning
|
4c5ffc129f
|
Merge branch 'develop' into develop_client_config
|
7 years ago |
yuan
|
ae8d4a66ba
|
fix html~
|
7 years ago |
|
wangning
|
fe26434e11
|
update
|
7 years ago |
|
wangning
|
ba8ec57049
|
update
|
7 years ago |
|
wangning
|
ca23d42860
|
merge conflicts
|
7 years ago |
eason.qian
|
f35bf01d83
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
9b1f6fa399
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
969e3ac2ee
|
fix
|
7 years ago |
|
wangning
|
305e530b1f
|
merge conflict
|
7 years ago |
|
wangning
|
37902465f6
|
merge conflict
|
7 years ago |
|
eason.qian
|
46fe387a69
|
fix
|
7 years ago |
|
wangning
|
f1ea0af02f
|
update
|
7 years ago |
|
wangning
|
521137d2ea
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
dc4c955395
|
fix bug
|
7 years ago |
|
eason.qian
|
b7b1d49454
|
fix
|
7 years ago |
|
wangning
|
4efcb964b5
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
35f66bf11a
|
Merge branch 'develop_risk' into develop
# Conflicts:
# src/db/modify.sql
|
7 years ago |
|
wangning
|
393b2cea90
|
update
|
7 years ago |
yixian
|
00a351a71c
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yixian
|
e11fa1efd5
|
rpay channel edit
|
7 years ago |
|
yuan
|
ee3e71e5c5
|
fix html~
|
7 years ago |
|
yuan
|
f4d5bdabaf
|
fix html~
|
7 years ago |
|
yuan
|
22c6e0aa5a
|
fix html~
|
7 years ago |
|
yixian
|
bca940a8c5
|
document update, php demo update
|
7 years ago |
|
eason.qian
|
ff80fbe56d
|
fix
|
7 years ago |
|
wangning
|
f4ee21ae6a
|
update
|
7 years ago |
|
wangning
|
b71cfdaa5c
|
update
|
7 years ago |
|
wangning
|
942acf08ba
|
update
|
7 years ago |
|
wangning
|
47df91b1c5
|
add manage web
|
7 years ago |
|
yuan
|
76d9b65b73
|
fix html
|
7 years ago |
|
yuan
|
6866c263ed
|
增加common_sub_merchant_id switch
|
7 years ago |
|
wangning
|
33db182dfb
|
tmp
|
7 years ago |
|
yuan
|
858494290f
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
159a565889
|
fix html
|
7 years ago |
|
eason.qian
|
4291fd4ec3
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
07f2474892
|
fix
|
7 years ago |
|
yuan
|
4b8ba85930
|
fix html
|
7 years ago |
|
yuan
|
3c79262ccd
|
fix html
|
7 years ago |
|
eason.qian
|
ae88cf1a10
|
fix
|
7 years ago |
|
eason.qian
|
bacde16fea
|
fix
|
7 years ago |
|
eason.qian
|
49ac845d23
|
fix
|
7 years ago |
|
wangning
|
51fdf932c1
|
tmp
|
7 years ago |
|
wangning
|
5e4e794d6d
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
