wangning
|
139eade7ee
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
yuan
|
40d2e729a1
|
fix~~
|
6 years ago |
|
wangning
|
2a498263b7
|
update
|
6 years ago |
|
yuan
|
455eedbcd5
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yuan
|
5b7349dbb8
|
fix~~
|
6 years ago |
|
wangning
|
843dbce89f
|
update
|
6 years ago |
|
wangning
|
71d25d675d
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
037c8adfa3
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
wangning
|
a99828d095
|
update
|
6 years ago |
|
yuan
|
49ad834a79
|
fix~~
|
6 years ago |
eason.qian
|
46302d675a
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
eason.qian
|
39e0d81d8a
|
fix
|
6 years ago |
|
yuan
|
d8bf233bd3
|
fix~~
|
6 years ago |
|
eason.qian
|
4f28d86abd
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
eason.qian
|
4cb89bf3ab
|
fix
|
6 years ago |
|
wangning
|
535e43dcb8
|
update
|
6 years ago |
|
eason.qian
|
82353cfe20
|
fix
|
6 years ago |
|
eason.qian
|
0737041653
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
eason.qian
|
8afa84baa3
|
Merge branch 'clientApply' into develop
|
6 years ago |
|
yuan
|
518228fc38
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yuan
|
7f69e34750
|
fix~~
|
6 years ago |
|
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 |
