eason.qian
|
4ac5d4132c
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
9 years ago |
|
eason.qian
|
950459e621
|
fix
|
9 years ago |
wangning
|
3b593ec9fb
|
Merge branch 'update' into develop
|
9 years ago |
|
wangning
|
4a4e6ad61f
|
update
|
9 years ago |
|
wangning
|
ff4bcc07f5
|
Merge branch 'update' into develop
|
9 years ago |
|
wangning
|
9a5cd5fa85
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
9 years ago |
|
wangning
|
cc94c56c5b
|
update
|
9 years ago |
|
wangning
|
92d2273f16
|
update
|
9 years ago |
yixian
|
39faf54c55
|
document update
|
9 years ago |
|
yixian
|
34d5e0121c
|
folder name update
|
9 years ago |
|
wangning
|
ab995db58f
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
9 years ago |
|
wangning
|
5779c9c1d6
|
Merge branch 'mail' into develop
|
9 years ago |
|
wangning
|
2e4bf7f332
|
init mail add short_name
|
9 years ago |
|
yixian
|
7d7ef6f2e6
|
Merge remote-tracking branch 'origin/master'
|
9 years ago |
|
yixian
|
aa70140535
|
nap
|
9 years ago |
|
eason.qian
|
df01e3f59b
|
fix
|
9 years ago |
|
eason.qian
|
7f4f195fee
|
Merge remote-tracking branch 'origin/master'
|
9 years ago |
|
eason.qian
|
d2ef9d0c25
|
Merge branch 'master' of /Users/yishuqian/Documents/workspace/royalpay/royalv2.manage with conflicts.
|
9 years ago |
|
wangning
|
8d08151728
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
9 years ago |
|
wangning
|
98843f0513
|
fixbug download contract
|
9 years ago |
|
wangning
|
5589d83f0d
|
add exchange rate cache
|
9 years ago |
yuan
|
9992cc0294
|
fix~
|
9 years ago |
|
yuan
|
b9d2fd2cf8
|
fix html
|
9 years ago |
|
wangning
|
3358eb269c
|
update
|
9 years ago |
|
wangning
|
8943d91097
|
fixbug contract greenchannel
|
9 years ago |
|
wangning
|
1fe41d5421
|
update
|
9 years ago |
|
eason.qian
|
0ea54d7191
|
fix
|
9 years ago |
|
yuan
|
df99ae3218
|
add title
|
9 years ago |
|
wangning
|
198b60e0d9
|
Merge branch 'develop_device_offline' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
|
9 years ago |
|
wangning
|
f48ccb5325
|
add contract analysis webview
|
9 years ago |
|
wangning
|
3321310500
|
update
|
9 years ago |
|
wangning
|
7c760fe803
|
update
|
9 years ago |
|
wangning
|
e023b105e9
|
update
|
9 years ago |
|
wangning
|
3b056b4092
|
update
|
9 years ago |
|
wangning
|
bcaa7a85ff
|
update
|
9 years ago |
|
eason.qian
|
9ab600ce57
|
Merge branch 'develop'
|
9 years ago |
|
eason.qian
|
4d23abd2a3
|
fix
|
9 years ago |
|
eason.qian
|
7ee71d67e8
|
Merge branch 'agreement' into develop
|
9 years ago |
|
eason.qian
|
bce1995633
|
fix
|
9 years ago |
|
wangning
|
ab94d60512
|
update
|
9 years ago |
|
wangning
|
7ab8a06feb
|
updateupdate
|
9 years ago |
|
wangning
|
81fb75377f
|
update
|
9 years ago |
|
wangning
|
b10606486b
|
update sql
|
9 years ago |
|
wangning
|
c2b9fc6424
|
update
|
9 years ago |
|
wangning
|
f79085be54
|
update
|
9 years ago |
|
eason.qian
|
d99cdd94e0
|
fix
|
9 years ago |
|
eason.qian
|
2b82ee9375
|
Merge branch 'develop'
|
9 years ago |
|
eason.qian
|
b2fca795d0
|
fix
|
9 years ago |
|
wangning
|
55bad532b4
|
sign channel
|
9 years ago |
|
wangning
|
ff32f2cad2
|
update
|
9 years ago |
