wangning
|
2b43a58632
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
a9bb6143b5
|
update
|
6 years ago |
yuan
|
7c4529e382
|
fix~~
|
6 years ago |
|
yuan
|
dd228d86c8
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yuan
|
ba0b61b701
|
fix~~
|
6 years ago |
|
wangning
|
8359b31873
|
update
|
6 years ago |
|
wangning
|
a49313d0b7
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
91e340f3c8
|
update
|
6 years ago |
|
wangning
|
99df2c0e9f
|
update
|
6 years ago |
|
yuan
|
1d5fd9f31e
|
fix~~
|
6 years ago |
|
yuan
|
8b8d2adb15
|
fix~~
|
6 years ago |
|
yuan
|
e28a3f1f9f
|
add ~
|
6 years ago |
|
yuan
|
30210a2c44
|
fix~
|
6 years ago |
|
wangning
|
a9c50800b0
|
add file interface
|
6 years ago |
|
yuan
|
e0bde1934d
|
add~
|
6 years ago |
|
yuan
|
c76c1f3a63
|
fix~
|
6 years ago |
|
yuan
|
7c8188466c
|
fix~
|
6 years ago |
|
yuan
|
198953cbad
|
Merge branch 'clientApply' into develop
|
6 years ago |
|
yuan
|
c287b2ec13
|
fix~
|
6 years ago |
|
wangning
|
fe8f851731
|
update
|
6 years ago |
|
wangning
|
b028a0deb1
|
update
|
6 years ago |
|
wangning
|
a84406f6c0
|
update
|
6 years ago |
|
yuan
|
18e9865b77
|
Merge remote-tracking branch 'origin/clientApply' into clientApply
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java
# src/main/ui/merchant_application.html
|
6 years ago |
|
wangning
|
9059101594
|
update
|
6 years ago |
|
wangning
|
e9573f77f7
|
update
|
6 years ago |
|
wangning
|
02903d5055
|
Merge branch 'clientApply' into develop
# Conflicts:
# src/main/ui/merchant_application.html
# src/main/ui/static/css/merchant_application.css
# src/main/ui/static/merchantapplication/merchant_application.js
|
6 years ago |
|
wangning
|
55e7c465b3
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
wangning
|
d03ea655a4
|
update
|
6 years ago |
|
wangning
|
0b70be1e4e
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
87a4dd4ac6
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
wangning
|
c327748b61
|
update
|
6 years ago |
|
yuan
|
483b3aa9c1
|
fix~
|
6 years ago |
|
wangning
|
943da647cb
|
update
|
6 years ago |
|
wangning
|
4bab6f1223
|
update
|
6 years ago |
|
wangning
|
e5ee89eb15
|
update
|
6 years ago |
|
wangning
|
b5f2f1ed29
|
update
|
6 years ago |
|
wangning
|
d9a6af58bb
|
update
|
6 years ago |
|
yuan
|
2ba51365ec
|
Merge remote-tracking branch 'origin/clientApply' into clientApply
|
6 years ago |
|
yuan
|
8131486839
|
Merge remote-tracking branch 'origin/clientApply' into clientApply
|
6 years ago |
|
wangning
|
3429300924
|
update
|
6 years ago |
|
wangning
|
51aa069acd
|
update
|
6 years ago |
|
wangning
|
73d07ba731
|
SettleMent Estimate alipayOnline
|
6 years ago |
|
wangning
|
2d8f06c845
|
update
|
6 years ago |
|
yuan
|
08f2736c8e
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yuan
|
89016d48f8
|
add getaway 13
|
6 years ago |
|
yuan
|
299f69957a
|
fix~
|
6 years ago |
|
yuan
|
f4da89ddcd
|
fix~
|
6 years ago |
|
wangning
|
24f3e1f356
|
Merge branch 'clientApply' of https://git.royalpay.com.au/git/royalv2.manage into clientApply
|
6 years ago |
|
wangning
|
be7727061d
|
update
|
6 years ago |
|
wangning
|
d51a174b7e
|
update
|
6 years ago |
