eason
|
b5156708f0
|
fix 清算记录未完成区别显示逻辑
|
6 years ago |
wangning
|
3395120f3c
|
update
|
7 years ago |
|
wangning
|
2cd21677b4
|
update
|
7 years ago |
|
wangning
|
10b60ec4a3
|
tmp
|
7 years ago |
|
wangning
|
605acc6ebc
|
update
|
7 years ago |
|
wangning
|
f765d896d3
|
Merge branch 'develop'
|
7 years ago |
|
wangning
|
47a3d005e9
|
Merge branch 'hotfix' into develop
# Conflicts:
# src/db/modify.sql
|
7 years ago |
|
wangning
|
ad570266df
|
optimum
|
7 years ago |
|
wangning
|
c4d142532a
|
tmp
|
7 years ago |
|
eason
|
a1917adbc1
|
fix
|
7 years ago |
yuan
|
b65f8f0a15
|
增加商户交易额导出功能
|
7 years ago |
|
yuan
|
7e2e560e54
|
增加自主申请查询列表
|
7 years ago |
|
wangning
|
f502ac2f80
|
update
|
7 years ago |
|
yuan
|
7c8c0c56c9
|
fix~
|
7 years ago |
|
wangning
|
f6be2111f2
|
merge conflict
|
7 years ago |
|
wangning
|
ed6d43b18a
|
add mail status
|
7 years ago |
|
yuan
|
2337e30251
|
fix~
|
7 years ago |
|
wangning
|
57b3a77fbd
|
update
|
7 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
|
7 years ago |
|
yuan
|
963c7951de
|
修改红包返现页面
|
7 years ago |
|
wangning
|
f9f58012e4
|
add mailgun interface
|
7 years ago |
|
yuan
|
f3f6af80f6
|
商户端增商户订单ID生成二维码功能
|
7 years ago |
|
wangning
|
35f66bf11a
|
Merge branch 'develop_risk' into develop
# Conflicts:
# src/db/modify.sql
|
7 years ago |
|
wangning
|
393b2cea90
|
update
|
7 years ago |
|
yuan
|
3c79262ccd
|
fix html
|
7 years ago |
|
eason.qian
|
f1c2894897
|
fix
|
7 years ago |
|
yuan
|
91c8b1a398
|
add sql
|
7 years ago |
|
eason.qian
|
df189f70ba
|
fix
|
7 years ago |
|
eason.qian
|
3f4a2cf9a6
|
fix partner invoice + settlement log tip
|
7 years ago |
|
eason.qian
|
649422f6ef
|
fix
|
7 years ago |
|
wangning
|
946b773031
|
update
|
7 years ago |
|
wangning
|
899ca5001e
|
update
|
7 years ago |
|
eason.qian
|
92646432d5
|
fix
|
7 years ago |
|
wangning
|
111073ba77
|
Merge branch 'master_contract_analysis' into develop
# Conflicts:
# src/db/modify.sql
# src/main/ui/manage.html
|
7 years ago |
|
wangning
|
69104c110c
|
update
|
7 years ago |
|
wangning
|
3cf45ef0cc
|
Merge branch 'develop_manual_settle' into develop
# Conflicts:
# src/db/modify.sql
|
7 years ago |
|
wangning
|
243a085b44
|
add manual settle
|
7 years ago |
|
wangning
|
caadaa605d
|
update
|
7 years ago |
|
wangning
|
1b462fd599
|
update
|
7 years ago |
|
wangning
|
9981c2b36f
|
add acts log
|
7 years ago |
|
eason.qian
|
4a78305160
|
fix
|
7 years ago |
|
eason.qian
|
9bafbc56c2
|
Merge branch 'notice' into develop
# Conflicts:
# src/db/modify.sql
# src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java
|
7 years ago |
|
eason.qian
|
6eb7c8b64f
|
Merge branch 'mondelay' into develop
# Conflicts:
# src/db/modify.sql
# src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java
|
7 years ago |
|
eason.qian
|
288f7d5e1f
|
fix
|
7 years ago |
|
eason.qian
|
88126bd581
|
fix
|
7 years ago |
|
eason.qian
|
f39c80b2d6
|
fix
|
7 years ago |
|
eason.qian
|
8e886dec43
|
fix
|
7 years ago |
|
eason.qian
|
08426e8a5a
|
fix
|
7 years ago |
|
eason.qian
|
df01e3f59b
|
fix
|
7 years ago |
|
eason.qian
|
d2ef9d0c25
|
Merge branch 'master' of /Users/yishuqian/Documents/workspace/royalpay/royalv2.manage with conflicts.
|
7 years ago |
