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
|
48184d9b60
|
Merge branch 'CustomerImpression' into develop
|
7 years ago |
|
wangning
|
9ddcea613f
|
update
|
7 years ago |
|
wangning
|
58aba0f91b
|
update
|
7 years ago |
|
wangning
|
28537f5783
|
tmp
|
7 years ago |
|
wangning
|
cd205dc5b5
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
ce7e6ccf82
|
Merge branch 'fixBugAppVersion' into develop
|
7 years ago |
eason.qian
|
8d7548f8d6
|
fix
|
7 years ago |
|
wangning
|
b257a7dfde
|
update
|
7 years ago |
|
wangning
|
9c567a6e98
|
update
|
7 years ago |
|
wangning
|
9d9b5d2527
|
customer impression
|
7 years ago |
|
eason.qian
|
613bfd0c30
|
fix
|
7 years ago |
yixian
|
6e626b4e2e
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yixian
|
c60fed5d29
|
gateway jsapi update
|
7 years ago |
yuan
|
5e5882a857
|
fix~
|
7 years ago |
|
yuan
|
57ebbea75b
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
cbcffe9a97
|
交易流水，合伙人，监控，增加组织筛选
|
7 years ago |
|
wangning
|
6f17abf3b3
|
Merge branch 'appNotice' into develop
|
7 years ago |
|
wangning
|
fecd1beb28
|
remove notice message "status"
|
7 years ago |
|
wangning
|
e734b44f9a
|
finish merge referrer & cityPartner
|
7 years ago |
|
wangning
|
902ee0aa3f
|
tmp
|
7 years ago |
|
wangning
|
9d72ee8451
|
tmp
|
7 years ago |
|
wangning
|
7db3c20519
|
Merge branch 'weekReport' into develop
# Conflicts:
# src/db/modify.sql
|
7 years ago |
|
wangning
|
efb70cf03e
|
fixbug week report thymeleaf
|
7 years ago |
|
wangning
|
9d213a018c
|
合并冲突
|
7 years ago |
|
wangning
|
c1dff4cb09
|
Merge branch 'andriodReleaseNote' into develop
# Conflicts:
# src/db/modify.sql
|
7 years ago |
|
wangning
|
c95568e565
|
tmp
|
7 years ago |
|
wangning
|
3f9ef5d8b1
|
Merge branch 'andriodReleaseNote' into mergeReferrer&CityPartner
# Conflicts:
# src/db/modify.sql
|
7 years ago |
|
wangning
|
f88ada4a20
|
andriod Release note
|
7 years ago |
|
eason.qian
|
a425a03f91
|
Merge branch 'develop'
|
7 years ago |
|
wangning
|
5561497b31
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
24b76d3fd5
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
1316ee44fb
|
Merge branch 'companyAddress' into develop
|
7 years ago |
|
wangning
|
e7fe4cceab
|
modify address
|
7 years ago |
|
wangning
|
6cd45c9ac2
|
tmp
|
7 years ago |
|
yixian
|
7a5cd92b27
|
remove duplicate
|
7 years ago |
|
yixian
|
785c182691
|
Merge branch 'hotfix20180115_cashbackdelaysettle' into develop
|
7 years ago |
|
yixian
|
9feb531c12
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yixian
|
708dbfcd44
|
settle delay cashback
|
7 years ago |
|
yixian
|
4901bd8b1c
|
settle delay cashback
|
7 years ago |
|
wangning
|
9730e6be3d
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
f14b7c10b9
|
Merge branch 'partnerCommission' into develop
|
7 years ago |
|
wangning
|
ce65ae462a
|
update
|
7 years ago |
|
wangning
|
3032d6315b
|
update
|
7 years ago |
|
wangning
|
9f8157372f
|
update
|
7 years ago |
|
yuan
|
5038be689d
|
fix~
|
7 years ago |
|
wangning
|
2eea4ed50c
|
calculat type
|
7 years ago |
|
yuan
|
41ec087b72
|
增加合伙人提成方式筛选，增加商户最低费率检测
|
7 years ago |
|
wangning
|
7a5a6276ac
|
update
|
7 years ago |
|
wangning
|
ea18e38234
|
tmp
|
7 years ago |
