wangning
|
ad6243d386
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
b0050d60f1
|
merge conflict
|
6 years ago |
|
wangning
|
9540f99d86
|
modify task method name
|
6 years ago |
Tayl0r
|
126b6b59bb
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
Tayl0r
|
2dfb1a052a
|
[Y] 签名增加验证节点ip
|
6 years ago |
yuan
|
4c3360f9e5
|
fix html
|
6 years ago |
|
wangning
|
11e7bd5e13
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
54ae201cde
|
modify redpack send rule
|
6 years ago |
|
yuan
|
963c7951de
|
修改红包返现页面
|
6 years ago |
|
wangning
|
f7774cf14f
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
9acc33a509
|
fixbug daily_transactions
|
6 years ago |
yixian
|
e386d9cfe8
|
Merge branch 'hotfix20180517compileerr' into develop
|
6 years ago |
|
yixian
|
d95e848045
|
compile error
|
6 years ago |
|
yixian
|
3034bf99fd
|
task edit for docker
|
6 years ago |
|
wangning
|
b55f8e3f9d
|
update
|
6 years ago |
|
wangning
|
601e678e09
|
update
|
6 years ago |
|
wangning
|
9a51b08d41
|
change microapp to MiniProgram
|
6 years ago |
|
yuan
|
68339f4027
|
订单查询增加gateway选项
|
6 years ago |
|
yuan
|
139711f662
|
fix html
|
6 years ago |
|
yuan
|
8f88d8084b
|
fix bug
|
6 years ago |
eason.qian
|
3d0310cf02
|
fix
|
6 years ago |
|
eason.qian
|
99487530a3
|
fix
|
6 years ago |
|
wangning
|
9a1844fa13
|
update
|
6 years ago |
|
wangning
|
e5ef17bd7e
|
update
|
6 years ago |
|
wangning
|
8512a9d0a9
|
add mailgun notify
|
6 years ago |
|
wangning
|
dc1f20c838
|
add mail test
|
6 years ago |
|
wangning
|
ec0ead8d68
|
update
|
6 years ago |
|
wangning
|
1391d556b9
|
Merge branch 'develop'
|
6 years ago |
|
wangning
|
85b0f7d653
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
1d666071ff
|
add bill page
|
6 years ago |
|
eason.qian
|
c6bdcde4a0
|
Merge branch 'develop'
|
6 years ago |
|
yuan
|
0ce6b156dd
|
fix html~~~
|
6 years ago |
|
eason.qian
|
a7bf155068
|
Merge branch 'develop'
# Conflicts:
# src/main/ui/static/payment/billqrcode/templates/bill_qrcode.html
|
6 years ago |
|
yuan
|
77621c6418
|
fix~
|
6 years ago |
|
eason.qian
|
420e644910
|
fix
|
6 years ago |
|
wangning
|
536ea593b0
|
Merge branch 'hotfix_2' into develop
|
6 years ago |
|
wangning
|
194b5d60a2
|
fix bug
|
6 years ago |
|
wangning
|
6fc0474464
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
wangning
|
e63f08ba19
|
fix bug
|
6 years ago |
|
wangning
|
9cf07ff142
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
wangning
|
a5f97c0fa0
|
roll back
|
6 years ago |
|
wangning
|
0bdb01445b
|
roll back
|
6 years ago |
|
wangning
|
42a103901a
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
14854979f8
|
close Estimate future interface
|
6 years ago |
|
wangning
|
ddee63590f
|
alsjd
|
6 years ago |
|
yuan
|
bce5a86aa4
|
fix bug~
|
6 years ago |
|
eason.qian
|
bb395fc38e
|
Merge branch 'develop'
|
6 years ago |
|
eason.qian
|
7f5dd867c3
|
fix
|
6 years ago |
|
eason.qian
|
e79066994a
|
Merge branch 'develop'
|
6 years ago |
|
yuan
|
c0fffb94e3
|
fix html
|
6 years ago |
