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 |
|
wangning
|
1fe41d5421
|
update
|
7 years ago |
|
eason.qian
|
0ea54d7191
|
fix
|
7 years ago |
|
wangning
|
ab94d60512
|
update
|
7 years ago |
|
wangning
|
b10606486b
|
update sql
|
7 years ago |
|
eason.qian
|
d99cdd94e0
|
fix
|
7 years ago |
|
eason.qian
|
dcd9c55f52
|
fix manager_id String
|
7 years ago |
|
macminiuser
|
8bacdb61ea
|
交易额+退款+退款+退款笔数+App流水接口、交易额相关接口调整
|
7 years ago |
|
wangning
|
6512c4d249
|
Merge branch 'update1' into develop
# Conflicts:
# src/db/modify.sql
# src/main/ui/static/analysis/org/templates/analysis_org.html
|
7 years ago |
|
wangning
|
2bea260aa0
|
Merge branch 'update' into develop
# Conflicts:
# src/db/modify.sql
|
7 years ago |
|
eason.qian
|
d3d0419c31
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/db/modify.sql
# src/main/ui/static/analysis/org/templates/analysis_org.html
|
7 years ago |
|
wangning
|
e391b89723
|
Merge branch 'mergeReferrer&CityPartner' into develop
# Conflicts:
# src/db/modify.sql
# src/main/ui/static/analysis/org/templates/analysis_org.html
|
7 years ago |
|
wangning
|
7e050369ee
|
Merge branch 'mergeReferrer&CityPartner'
# Conflicts:
# src/db/modify.sql
|
7 years ago |
|
eason.qian
|
613bfd0c30
|
fix
|
7 years ago |
|
wangning
|
7db3c20519
|
Merge branch 'weekReport' into develop
# Conflicts:
# src/db/modify.sql
|
7 years ago |
|
wangning
|
9d213a018c
|
合并冲突
|
7 years ago |
|
wangning
|
c1dff4cb09
|
Merge branch 'andriodReleaseNote' into develop
# Conflicts:
# src/db/modify.sql
|
7 years ago |
|
wangning
|
3f9ef5d8b1
|
Merge branch 'andriodReleaseNote' into mergeReferrer&CityPartner
# Conflicts:
# src/db/modify.sql
|
7 years ago |
