wangning
|
adac252b26
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
wangning
|
2bea260aa0
|
Merge branch 'update' into develop
# Conflicts:
# src/db/modify.sql
|
7 years ago |
wangning
|
b153a3add8
|
update
|
7 years ago |
eason.qian
|
be08073c17
|
Merge branch 'develop'
|
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
|
a2ff3bb338
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
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 |
yuan
|
1d80f8fcc7
|
fix~
|
7 years ago |
yuan
|
846bc84c0a
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
yuan
|
9b6c378506
|
fix~
|
7 years ago |
yuan
|
3b2718e6fe
|
fix~
|
7 years ago |
eason.qian
|
8d7548f8d6
|
fix
|
7 years ago |
yixian
|
b8b5ea5a63
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
yixian
|
d679cfc334
|
gateway jsapi update
|
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
|
e734b44f9a
|
finish merge referrer & cityPartner
|
7 years ago |
wangning
|
902ee0aa3f
|
tmp
|
7 years ago |
wangning
|
9d72ee8451
|
tmp
|
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 |
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
|
785c182691
|
Merge branch 'hotfix20180115_cashbackdelaysettle' into develop
|
7 years ago |
wangning
|
9730e6be3d
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
wangning
|
ce65ae462a
|
update
|
7 years ago |
wangning
|
3032d6315b
|
update
|
7 years ago |
wangning
|
9f8157372f
|
update
|
7 years ago |
wangning
|
2eea4ed50c
|
calculat type
|
7 years ago |
yuan
|
41ec087b72
|
增加合伙人提成方式筛选,增加商户最低费率检测
|
7 years ago |
wangning
|
74eca570af
|
Merge branch 'agent' into develop
|
7 years ago |
wangning
|
cfb67ac4de
|
agent commission finish
|
7 years ago |
yixian
|
0681a81bb4
|
sysParams
|
7 years ago |
wangning
|
3bbdd7968a
|
tmp
|
7 years ago |
wangning
|
a02314e294
|
Customer impression task
|
7 years ago |
wangning
|
b46745ed55
|
tmp
|
7 years ago |
wangning
|
fb1f4f95b2
|
update
|
7 years ago |
yuan
|
72244fef3b
|
fix~
|
7 years ago |
wangning
|
d93445eec2
|
tmp
|
7 years ago |
eason.qian
|
8850543d30
|
fix
|
7 years ago |
wangning
|
eefec84fc7
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
wangning
|
c84bb59102
|
Merge branch 'Jpush' into develop
|
7 years ago |
wangning
|
9df05a5ee1
|
update
|
7 years ago |
yuan
|
c964f93649
|
fix~
|
7 years ago |
eason.qian
|
49609d0f2c
|
fix
|
7 years ago |
yuan
|
2b377006cb
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
yuan
|
c53ea04d2e
|
fix~
|
7 years ago |
eason.qian
|
f1f1a62e31
|
fix add orgmanager Role
|
7 years ago |
eason.qian
|
bace0e420e
|
fix
|
7 years ago |
yuan
|
0cbefe6558
|
fix~
|
7 years ago |
yuan
|
c10502580f
|
fix~
|
7 years ago |
yuan
|
d8041ca3ce
|
fix~
|
7 years ago |
yuan
|
66775e24c2
|
组织管理增加二级筛选,用户管理,交易流水,增加二级代理筛选
|
7 years ago |
wangning
|
9b8b9639c0
|
update
|
7 years ago |
wangning
|
2323459f31
|
finish refactor the message
|
7 years ago |
yuan
|
af0c5a8cae
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
yuan
|
b7abc5b78f
|
商户详情里增加Local Merchant按钮
|
7 years ago |
yixian
|
fba967152d
|
points
|
7 years ago |
wangning
|
06b857eb51
|
update
|
7 years ago |
wangning
|
7372c93190
|
phone top up list
|
7 years ago |
yixian
|
bc4122226b
|
settle warnings
|
7 years ago |
wangning
|
a7519cf5ee
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
wangning
|
1a81591c93
|
modify ofei error message
|
7 years ago |
yixian
|
f06eb372dd
|
Merge branch 'hotfix20180102settlereportyearselect' into develop
|
7 years ago |
yixian
|
633c3420c7
|
year select
|
7 years ago |
yixian
|
13e8a44b80
|
Merge branch 'hotfix20180102settlereportyearselect' into develop
|
7 years ago |
yixian
|
116d1d74c4
|
settle report year select
|
7 years ago |
yuan
|
42eb1ed609
|
修改登录页与过渡页图标
|
7 years ago |
Tayl0r
|
e629c97005
|
修改合规文件移动端显示
|
7 years ago |
wangning
|
569af3aea0
|
Merge branch 'develop'
|
7 years ago |
wangning
|
ed9c867027
|
Merge branch 'master' into develop
|
7 years ago |
wangning
|
69e4220698
|
phone top up Test demo
|
7 years ago |
eason.qian
|
8827728559
|
fix
|
7 years ago |
yixian
|
359f357f2c
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
yixian
|
381114e974
|
order expiry setter
|
7 years ago |
eason.qian
|
c983035613
|
fix
|
7 years ago |
yuan
|
573ae86bff
|
fix~
|
7 years ago |
Tayl0r
|
bfaee6b248
|
remove scroll
|
7 years ago |
Tayl0r
|
c4353dbae1
|
remove forbidden scroll
|
7 years ago |
Tayl0r
|
ec4cf679e8
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
Tayl0r
|
f077f778b3
|
fix js
|
7 years ago |
wangning
|
c2c7f87bc0
|
logo
|
7 years ago |
yixian
|
c6bd5aeea3
|
cashier
|
7 years ago |
Tayl0r
|
37daac03e3
|
修改背景 登录框样式
|
7 years ago |
yuan
|
1a8a4ab94b
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
yuan
|
fd6db4c432
|
fix~
|
7 years ago |
yixian
|
ad33e29b3d
|
cashier
|
7 years ago |
yixian
|
34f893a210
|
cashier
|
7 years ago |
yuan
|
8073bf876c
|
更改BD销售页行业展示,增加表格导出
|
7 years ago |
yuan
|
5f8acdb6d2
|
更换登录页与过度页图片
|
7 years ago |
yixian
|
7db1195937
|
init
|
7 years ago |