wangning
|
a02314e294
|
Customer impression task
|
7 years ago |
|
wangning
|
b46745ed55
|
tmp
|
7 years ago |
Tayl0r
|
e5c48fad29
|
fix
|
7 years ago |
yuan
|
02e3d58be7
|
fix~
|
7 years ago |
eason.qian
|
63f6832d5e
|
fix
|
7 years ago |
|
eason.qian
|
575f0b7725
|
fix
|
7 years ago |
|
wangning
|
a9577f0033
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
974d1e09ea
|
Customer impression task
|
7 years ago |
|
wangning
|
fb1f4f95b2
|
update
|
7 years ago |
|
yuan
|
72244fef3b
|
fix~
|
7 years ago |
|
eason.qian
|
2a48f5a6aa
|
fix
|
7 years ago |
|
eason.qian
|
e064d30a64
|
fix
|
7 years ago |
|
eason.qian
|
8eca73d1a0
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
50321ef85c
|
fix
|
7 years ago |
|
wangning
|
d93445eec2
|
tmp
|
7 years ago |
|
wangning
|
743662719f
|
update message
|
7 years ago |
|
eason.qian
|
a206d3a8c5
|
fix
|
7 years ago |
|
eason.qian
|
ea19cd8c9b
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
8850543d30
|
fix
|
7 years ago |
|
wangning
|
ec85f30c98
|
update log
|
7 years ago |
|
wangning
|
f99cacdf7f
|
update
|
7 years ago |
|
wangning
|
eefec84fc7
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
ef828b55e5
|
jpush app key
|
7 years ago |
|
wangning
|
c84bb59102
|
Merge branch 'Jpush' into develop
|
7 years ago |
|
wangning
|
9df05a5ee1
|
update
|
7 years ago |
|
eason.qian
|
fc63e8428b
|
fix
|
7 years ago |
|
yuan
|
bf1770d552
|
fix~
|
7 years ago |
|
yuan
|
c964f93649
|
fix~
|
7 years ago |
|
wangning
|
113d2bcc84
|
update
|
7 years ago |
|
wangning
|
d28313c06a
|
agentCommission
|
7 years ago |
|
eason.qian
|
49609d0f2c
|
fix
|
7 years ago |
|
yuan
|
2b377006cb
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
a9e1d653aa
|
fix
|
7 years ago |
|
yuan
|
c53ea04d2e
|
fix~
|
7 years ago |
|
eason.qian
|
f1f1a62e31
|
fix add orgmanager Role
|
7 years ago |
|
eason.qian
|
9abd9b36ed
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
322c4ea227
|
fix
|
7 years ago |
yixian
|
9a40d2b726
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yixian
|
796a600812
|
Merge branch 'hotfix02180109compile_err' into develop
|
7 years ago |
|
yixian
|
30485cde91
|
config
|
7 years ago |
|
yixian
|
532a122a28
|
compileError
|
7 years ago |
|
eason.qian
|
bace0e420e
|
fix
|
7 years ago |
|
wangning
|
f55329661c
|
tmp
|
7 years ago |
|
wangning
|
ae5a21fc3c
|
update
|
7 years ago |
|
yuan
|
0cbefe6558
|
fix~
|
7 years ago |
|
yuan
|
c10502580f
|
fix~
|
7 years ago |
|
wangning
|
0563d91d68
|
update android msg
|
7 years ago |
|
yuan
|
d8041ca3ce
|
fix~
|
7 years ago |
|
wangning
|
fe9815aba6
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
5597444015
|
update
|
7 years ago |
|
yuan
|
66775e24c2
|
组织管理增加二级筛选，用户管理，交易流水，增加二级代理筛选
|
7 years ago |
|
wangning
|
3e5c785433
|
Merge branch 'costomerImpression' into develop
|
7 years ago |
|
wangning
|
3738ebb1c4
|
customer impression
|
7 years ago |
|
wangning
|
f41e4c2ab7
|
update
|
7 years ago |
|
wangning
|
4eec126f95
|
test
|
7 years ago |
|
eason.qian
|
2519717c54
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
4644f30cad
|
fix
|
7 years ago |
|
wangning
|
9b8b9639c0
|
update
|
7 years ago |
|
wangning
|
c3b20d0aff
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
993fe26a1e
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
2323459f31
|
finish refactor the message
|
7 years ago |
|
wangning
|
39966a1cee
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
653b66f8f5
|
update
|
7 years ago |
|
wangning
|
835246c24a
|
tmp
|
7 years ago |
|
wangning
|
25cb91d372
|
Merge branch 'update2' into develop
|
7 years ago |
|
wangning
|
20fcdb89cb
|
update
|
7 years ago |
|
wangning
|
0327de0101
|
tmp
|
7 years ago |
|
eason.qian
|
d988b7fa3d
|
Merge branch 'master' into develop
|
7 years ago |
|
wangning
|
db15bacef1
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
3fe7db9421
|
update
|
7 years ago |
|
wangning
|
2550cef8db
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
916c7fce3f
|
update
|
7 years ago |
|
eason.qian
|
d9f715bb92
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
3526367848
|
fix
|
7 years ago |
|
wangning
|
e4c8f7de62
|
update
|
7 years ago |
|
wangning
|
5802cd65a2
|
Merge branch 'udpate' into develop
|
7 years ago |
|
wangning
|
ea8a6fa275
|
update
|
7 years ago |
|
yuan
|
af0c5a8cae
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
b7abc5b78f
|
商户详情里增加Local Merchant按钮
|
7 years ago |
|
wangning
|
0d280f93ac
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
c01d34332c
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
bc45d5389d
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
df2d13826f
|
update
|
7 years ago |
|
yixian
|
17039a0e8b
|
Merge branch 'hotfix20180104customerpoints' into develop
|
7 years ago |
|
yixian
|
fec1decc5f
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yixian
|
fba967152d
|
points
|
7 years ago |
|
wangning
|
bc5a7485ba
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
3f9d65aa58
|
update
|
7 years ago |
|
wangning
|
426638a76c
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
e20e85fa17
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
4027c84deb
|
update
|
7 years ago |
|
yuan
|
21502cf568
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
633a128c81
|
fix~
|
7 years ago |
|
eason.qian
|
b237c9072c
|
fix newCustomers
|
7 years ago |
|
wangning
|
de7a193402
|
Jpush
|
7 years ago |
|
wangning
|
06b857eb51
|
update
|
7 years ago |
|
wangning
|
7372c93190
|
phone top up list
|
7 years ago |
|
wangning
|
5160d9f9cb
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
deb4732397
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
1aa6f6680f
|
fixbug
|
7 years ago |
|
yixian
|
bc4122226b
|
settle warnings
|
7 years ago |
|
wangning
|
11c524729d
|
update
|
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 |
|
eason.qian
|
50243843df
|
fix
|
7 years ago |
|
wangning
|
8ba499ce78
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
7b0f5dc2ca
|
rename
|
7 years ago |
|
Tayl0r
|
e629c97005
|
修改合规文件移动端显示
|
7 years ago |
|
yixian
|
8b15199265
|
list daily transactions bug
|
7 years ago |
|
yixian
|
d603b882a7
|
paynotice
|
7 years ago |
|
eason.qian
|
0821e3ff32
|
fix
|
7 years ago |
|
eason.qian
|
735f8b7673
|
fix
|
7 years ago |
|
eason.qian
|
ea1e789045
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
d55919af7d
|
fix
|
7 years ago |
|
yixian
|
f1a2780a28
|
env,lang3
|
7 years ago |
|
wangning
|
cf275293ea
|
fixbug
|
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
|
1dceaae57b
|
fix
|
7 years ago |
|
eason.qian
|
8827728559
|
fix
|
7 years ago |
|
wangning
|
9ea8134c24
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
89c10f9cc6
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
wangning
|
83d29cc881
|
fixbug
|
7 years ago |
|
yixian
|
359f357f2c
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yixian
|
381114e974
|
order expiry setter
|
7 years ago |
|
wangning
|
ed14f21cb1
|
update
|
7 years ago |
|
wangning
|
47c7b67eb7
|
add ofei
|
7 years ago |
|
wangning
|
c6344877ad
|
update
|
7 years ago |
|
wangning
|
1b48cd65f3
|
Customer impression
|
7 years ago |
|
eason.qian
|
08d0fcb4c2
|
fix
|
7 years ago |
|
yuan
|
c9234149f1
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yuan
|
6253447003
|
增加customer调用接口，获取manager列表
|
7 years ago |
|
eason.qian
|
95dff547d2
|
fix
|
7 years ago |
|
eason.qian
|
c983035613
|
fix
|
7 years ago |
|
yuan
|
573ae86bff
|
fix~
|
7 years ago |
|
wangning
|
4ceef6abb1
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
f26a747c05
|
add new sub partner excepeion
|
7 years ago |
|
eason.qian
|
bbede6fa04
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
2596573b83
|
fix
|
7 years ago |
|
wangning
|
0b7f69d450
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
9647e0e1f4
|
模板页
|
7 years ago |
|
Tayl0r
|
8b078e28a7
|
fix bugs
|
7 years ago |
|
wangning
|
bfbb4d37d9
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
eason.qian
|
d3f65edccf
|
fix commons
|
7 years ago |
