eason.qian
|
2b82ee9375
|
Merge branch 'develop'
|
9 years ago |
|
eason.qian
|
b2fca795d0
|
fix
|
9 years ago |
Tayl0r
|
556e2fd572
|
Merge branch 'develop'
|
9 years ago |
|
Tayl0r
|
4bd4820126
|
[Y] 修改上传文件大小
|
9 years ago |
|
Tayl0r
|
d6020a48ce
|
Merge branch 'develop'
|
9 years ago |
|
Tayl0r
|
be9380de3d
|
[Y] 合同测试生成
|
9 years ago |
yixian
|
b1bebb8d0f
|
web error
|
9 years ago |
|
yixian
|
d778ad622c
|
web error
|
9 years ago |
|
yixian
|
11a81ba7b6
|
Merge remote-tracking branch 'origin/develop' into develop
|
9 years ago |
|
yixian
|
de825dee0d
|
Merge branch 'hotfix_20180306_exporterror' into develop
|
9 years ago |
|
yixian
|
5c57271ea9
|
Merge remote-tracking branch 'origin/master'
|
9 years ago |
|
yixian
|
715f718092
|
export error
|
9 years ago |
|
eason.qian
|
a0df3ab9ee
|
Merge branch 'develop'
|
9 years ago |
|
eason.qian
|
b9c4d60607
|
Merge remote-tracking branch 'origin/develop' into develop
|
9 years ago |
|
eason.qian
|
188ee72cd0
|
fix
|
9 years ago |
|
yixian
|
7aae1e7c6b
|
Merge remote-tracking branch 'origin/develop' into develop
|
9 years ago |
|
yixian
|
1b0d05c1a7
|
Merge branch 'hotfix20180306transdownload' into develop
|
9 years ago |
|
yixian
|
b05de3e6ef
|
Merge branch 'hotfix20180306transdownload'
# Conflicts:
# src/main/ui/static/payment/tradelog/templates/partner_settlement_logs.html
|
9 years ago |
|
yixian
|
b93660ca9e
|
client support multiple settles in one day
|
9 years ago |
|
yixian
|
8df1425bd2
|
client support multiple settles in one day
|
9 years ago |
|
yixian
|
3e13c03215
|
client support multiple settles in one day
|
9 years ago |
|
yixian
|
b2dccadab2
|
client support multiple settles in one day
|
9 years ago |
wangning
|
0bcce4efbc
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
9 years ago |
|
wangning
|
daae66eb96
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
9 years ago |
|
wangning
|
d787ec14ec
|
Merge branch 'master_app_udpate' into develop
|
9 years ago |
|
wangning
|
3b7ff0c889
|
app udpate
|
9 years ago |
|
eason.qian
|
89a9c1c061
|
fix change logo
|
9 years ago |
|
eason.qian
|
2d828c0255
|
Merge branch 'master' into develop
|
9 years ago |
|
eason.qian
|
cfb3070c49
|
fix
|
9 years ago |
|
wangning
|
1c471262e4
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
9 years ago |
|
wangning
|
63f9391f58
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
9 years ago |
|
wangning
|
7c66dc425d
|
Merge branch 'master_billOrder' into develop
|
9 years ago |
|
wangning
|
7df8eff2fd
|
fixbug
|
9 years ago |
|
yixian
|
84b0fdaa85
|
hide gst in customer's view
|
9 years ago |
|
yixian
|
ed810dcefa
|
hide gst in customer's view
|
9 years ago |
|
yixian
|
069f409590
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
|
9 years ago |
|
yixian
|
fa579346c5
|
Merge branch 'hotfix20180227gst' into develop
|
9 years ago |
|
yixian
|
ab82fb7661
|
Merge branch 'hotfix20180227gst'
|
9 years ago |
|
yixian
|
349416eda6
|
hide gst in customer's view
|
9 years ago |
|
yixian
|
cdb23f746b
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
|
9 years ago |
|
yixian
|
d273b75fbc
|
hide gst in customer's view
|
9 years ago |
|
yixian
|
9f70551e39
|
Merge branch 'hotfix20180227gst'
|
9 years ago |
|
yixian
|
138820f1bd
|
gst in surcharge config
|
9 years ago |
|
wangning
|
e363faba95
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
9 years ago |
|
wangning
|
92c2ed1d57
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
9 years ago |
|
wangning
|
464fc1b474
|
update
|
9 years ago |
|
eason.qian
|
106ca85bfb
|
fix
|
9 years ago |
|
eason.qian
|
636ab2cf01
|
fix
|
9 years ago |
|
eason.qian
|
9b7c6ab014
|
fix
|
9 years ago |
|
wangning
|
e8478bb641
|
update
|
9 years ago |
