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 |
|
wangning
|
63a22cd783
|
update
|
6 years ago |
|
wangning
|
8f38a3f2c4
|
fix customer_order statics
|
6 years ago |
|
wangning
|
748e021f55
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
6 years ago |
|
eason.qian
|
83f2de9c93
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
eason.qian
|
85bf0c378d
|
fix
|
6 years ago |
|
wangning
|
f6d2f04711
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
6 years ago |
|
wangning
|
b569b5fc5d
|
update
|
6 years ago |
