yuan
|
db58007ee7
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
yuan
|
451b6f2a7b
|
fix~~
|
6 years ago |
wangning
|
4a0b57c76f
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
yuan
|
e6ac37fd05
|
fix~~
|
6 years ago |
wangning
|
6e531b006b
|
update
|
6 years ago |
wangning
|
192a3ddf83
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
wangning
|
5ac7c7322c
|
1.add country default value
2.generate contract ignore source=4
|
6 years ago |
yuan
|
4dabd64c45
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
yuan
|
bc971bd8b5
|
fix~~
|
6 years ago |
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 |
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 |
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 |
wangning
|
f502ac2f80
|
update
|
6 years ago |
eason.qian
|
9944407894
|
自助开通合规流程改造
|
6 years ago |
yuan
|
c7a80a9b26
|
Merge remote-tracking branch 'origin/clientApply' into clientApply
|
6 years ago |
yuan
|
74a59a1bd3
|
fix~
|
6 years ago |
wangning
|
c56773120d
|
update
|
6 years ago |
wangning
|
06a4804543
|
Merge branch 'clientApply' of https://git.royalpay.com.au/git/royalv2.manage into clientApply
|
6 years ago |
wangning
|
df1e735eff
|
update
|
6 years ago |
yuan
|
19f0045183
|
fix~
|
6 years ago |
wangning
|
b4f76e8182
|
update
|
6 years ago |
wangning
|
6b83b79512
|
update
|
6 years ago |
wangning
|
914525f150
|
Merge remote-tracking branch 'origin/clientApply' into clientApply
# Conflicts:
# src/main/ui/merchant_application.html
|
6 years ago |
wangning
|
c6d83b1c5a
|
update
|
6 years ago |
wangning
|
ce27310c40
|
update
|
6 years ago |
yuan
|
1ff35dc8d1
|
fix~
|
6 years ago |
yuan
|
7c8c0c56c9
|
fix~
|
6 years ago |
wangning
|
41376c740f
|
update
|
6 years ago |
wangning
|
2d829fb746
|
update name
|
6 years ago |
wangning
|
0108ab9322
|
update
|
6 years ago |
wangning
|
1e97502b4b
|
update
|
6 years ago |
wangning
|
2b414c537d
|
update
|
6 years ago |
wangning
|
f6be2111f2
|
merge conflict
|
6 years ago |
wangning
|
5980813f58
|
update
|
6 years ago |
wangning
|
25f11e7c3c
|
update
|
6 years ago |
wangning
|
ed6d43b18a
|
add mail status
|
6 years ago |
yuan
|
2337e30251
|
fix~
|
6 years ago |
wangning
|
047ba2b7d7
|
update url
|
6 years ago |
yuan
|
0c393ef0bc
|
Merge remote-tracking branch 'origin/clientApply' into clientApply
|
6 years ago |
yuan
|
00655632b4
|
fix~
|
6 years ago |
wangning
|
c4f2de599e
|
update
|
6 years ago |
wangning
|
3bbf73298d
|
merge conflict
|
6 years ago |
wangning
|
45c8e9248c
|
update
|
6 years ago |
yuan
|
54f7f8ee9c
|
fix~
|
6 years ago |
yuan
|
9889521acd
|
fix~
|
6 years ago |
wangning
|
89d0c7a4ae
|
rollback
|
6 years ago |
wangning
|
3f03b2aa18
|
tmp
|
6 years ago |
wangning
|
e9be935d2a
|
update
|
6 years ago |
wangning
|
9da06355cb
|
Merge branch 'hotfix' into develop
|
6 years ago |
wangning
|
0cbd63031f
|
update
|
6 years ago |
wangning
|
82562fb045
|
tmp
|
6 years ago |
wangning
|
fd74bf0e22
|
update
|
6 years ago |
yuan
|
5984216f64
|
Merge remote-tracking branch 'origin/clientApply' into clientApply
|
6 years ago |
eason.qian
|
2733a1ea76
|
fix
|
6 years ago |
wangning
|
15fe2c59fb
|
add verify mail & SMS code
|
6 years ago |
yuan
|
9d05f01072
|
Merge remote-tracking branch 'origin/clientApply' into clientApply
|
6 years ago |
wangning
|
1842e10bb3
|
tmp
|
6 years ago |
wangning
|
543964051b
|
tmp
|
6 years ago |
wangning
|
48cc6509c0
|
tmp
|
6 years ago |
wangning
|
025c3525f2
|
Merge branch 'hotfix' into develop
|
6 years ago |
wangning
|
67062c1930
|
add risk record authority
|
6 years ago |
wangning
|
09976bbab9
|
tmp
|
6 years ago |
yuan
|
3569ec32e9
|
Merge branch 'merchant_application' into clientApply
|
6 years ago |
yuan
|
de98a7c279
|
add
|
6 years ago |
wangning
|
687c8b10e7
|
Merge branch 'test' into develop
# Conflicts:
# src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java
|
6 years ago |
wangning
|
c81e91d1b2
|
update
|
6 years ago |
eason.qian
|
0851f793a0
|
Merge branch 'develop' into clientApply
|
6 years ago |
wangning
|
11cf6b5819
|
update
|
6 years ago |
wangning
|
55375af2ed
|
fix
|
6 years ago |
wangning
|
4dd95c3cf5
|
fix
|
6 years ago |
wangning
|
57b3a77fbd
|
update
|
6 years ago |
wangning
|
f24084254c
|
add log
|
6 years ago |
wangning
|
32a317c344
|
update
|
6 years ago |
eason.qian
|
b801aba02d
|
mailgun
|
6 years ago |
eason.qian
|
23258a78bb
|
Merge branch 'mailgun' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/task/PartnerInitEmailChecker.java
# src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java
|
6 years ago |
eason.qian
|
a4fb42ef4b
|
fix
|
6 years ago |
wangning
|
25d54b340b
|
Merge branch 'mailGunTest' into test
# Conflicts:
# src/main/resources/application-local.properties
# src/main/resources/application.properties
# src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java
|
6 years ago |
wangning
|
6ab808a45f
|
update
|
6 years ago |
wangning
|
128eddeb28
|
update
|
6 years ago |
wangning
|
c2d64ca19a
|
qrcode
|
6 years ago |
wangning
|
da05f901ca
|
qrcode
|
6 years ago |
Tayl0r
|
807166f6fc
|
log
|
6 years ago |
wangning
|
5661406e27
|
update
|
6 years ago |
wangning
|
2e01748e11
|
add maven test
|
6 years ago |