wangning
|
c8c837fa88
|
Merge branch 'develop'
|
6 years ago |
|
wangning
|
d0ffdafd0c
|
fixbug
|
6 years ago |
|
wangning
|
9a226c784e
|
fixbug
|
6 years ago |
|
wangning
|
f4834f6912
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
6 years ago |
|
wangning
|
769d28d28b
|
fixbug
|
6 years ago |
|
wangning
|
e17b2ffbae
|
add log
|
6 years ago |
|
wangning
|
60b347d5f1
|
add log
|
6 years ago |
|
wangning
|
b22b39cc4e
|
add log
|
6 years ago |
|
wangning
|
418ea1dca5
|
add log
|
6 years ago |
|
wangning
|
58a2011053
|
add log
|
6 years ago |
|
wangning
|
e47b386e25
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
c7bb10d30c
|
add log
|
6 years ago |
yuan
|
de65a22e7b
|
fix~
|
6 years ago |
|
yuan
|
0be9a6548d
|
fix~
|
6 years ago |
|
yuan
|
ee0b68e8a5
|
fix~
|
6 years ago |
|
yuan
|
b7241f6e9e
|
fix~
|
6 years ago |
|
yuan
|
20bdd9a5b2
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yuan
|
28c714d9c8
|
fix~
|
6 years ago |
|
wangning
|
d535f982e4
|
tmp
|
6 years ago |
|
yuan
|
7e2e560e54
|
增加自主申请查询列表
|
6 years ago |
|
wangning
|
9822eff9a8
|
tmp
|
6 years ago |
|
wangning
|
5e870b307a
|
Merge branch 'develop_app' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
# src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
|
6 years ago |
|
wangning
|
84ccd1dd85
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
a78fa866c9
|
Merge branch 'hotfi' into develop
|
6 years ago |
|
wangning
|
28d72b83bc
|
bugfix
|
6 years ago |
|
yuan
|
69ebfcb07f
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yuan
|
b7e978d8c8
|
fix~
|
6 years ago |
yixian
|
d783ee0639
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yixian
|
8cf06cdfce
|
fix nullpointer error
|
6 years ago |
|
wangning
|
abc6ba1d7c
|
测试配置
|
6 years ago |
|
wangning
|
da4a151e81
|
update
|
6 years ago |
|
wangning
|
24e1c25672
|
Merge branch 'hotfix' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java
|
6 years ago |
|
wangning
|
347e63152f
|
Merge branch 'hotfix'
|
6 years ago |
|
wangning
|
3526941e60
|
update
|
6 years ago |
|
wangning
|
9d41194522
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
6 years ago |
|
wangning
|
653776594b
|
Merge branch 'hotfix' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientApplyController.java
|
6 years ago |
|
wangning
|
9fbabffb43
|
update
|
6 years ago |
eason.qian
|
e8102a27fd
|
fix
|
6 years ago |
|
eason.qian
|
a0d151d8bd
|
fix 批量修改商户BD
|
6 years ago |
|
eason.qian
|
e3d90debbb
|
fix nap 订单 用户头像
|
6 years ago |
|
wangning
|
fc2730c5df
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
954ea54a74
|
update
|
6 years ago |
|
wangning
|
5055bcdd23
|
test
|
6 years ago |
|
yuan
|
6981aa715e
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yuan
|
23d5d80c14
|
修改dashboard.html
|
6 years ago |
|
yuan
|
e9f24a5efb
|
Merge branch 'fix_dashboard_6/1' into develop
|
6 years ago |
|
yuan
|
56a6497dbb
|
fix~~
|
6 years ago |
|
wangning
|
280588a2f9
|
rollback
|
6 years ago |
|
wangning
|
5e077000de
|
测试配置
|
6 years ago |
|
wangning
|
50afd1207d
|
rollback
|
6 years ago |
