eason
|
413f38b1af
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/db/modify.sql
|
6 years ago |
luoyang14z7
|
bc381cf03a
|
add : modify.sql
|
6 years ago |
|
luoyang14z7
|
dc9a21b07f
|
fix : develop_act_Chairty
|
6 years ago |
|
eason
|
e4eac97729
|
Merge branch 'new_bd_commissions' into develop
|
6 years ago |
kira
|
ed42133822
|
Merge branch 'develop_client_permission' into develop
|
6 years ago |
|
luoyang14z7
|
48d5daf4ca
|
fix : develop_act_Chairty
|
6 years ago |
|
luoyang14z7
|
3cd97ffbde
|
fix : develop_act_Chairty
|
6 years ago |
|
kira
|
8a5a0b0237
|
Merge branch 'develop_client_permission' into develop
|
6 years ago |
|
luoyang14z7
|
0bbd6b8297
|
fix : develop_act_Chairty
|
6 years ago |
|
luoyang14z7
|
df14273f57
|
fix : develop_act_Chairty
|
6 years ago |
|
eason
|
af744d6efb
|
fix
|
6 years ago |
|
kira
|
9b7e268788
|
Merge branch 'develop_client_permission' into develop
|
6 years ago |
|
luoyang14z7
|
d490fbc865
|
add : develop_act_Chairty
|
6 years ago |
yuan
|
4ffb9f7bcd
|
Merge branch '7/10' into develop
|
6 years ago |
|
yuan
|
1aabaa91ad
|
move html
|
6 years ago |
|
yuan
|
3e48a1c82a
|
Merge branch '7/10' into develop
|
6 years ago |
|
yuan
|
ba846d542b
|
add html
|
6 years ago |
|
wangning
|
ec4fe4976e
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
wangning
|
9ea819a9df
|
add act charity
|
6 years ago |
|
wangning
|
6c7d02be00
|
update
|
6 years ago |
|
yuan
|
b2533ca349
|
fix BD Commissions
|
6 years ago |
|
wangning
|
df0616707e
|
update 文案
|
6 years ago |
|
wangning
|
8523b40ffb
|
udpate
|
6 years ago |
|
wangning
|
82df945256
|
update
|
6 years ago |
|
luoyang14z7
|
08b1230f4f
|
Merge remote-tracking branch 'work/develop_client_permission' into develop_client_permission
|
6 years ago |
|
luoyang14z7
|
8f7d5f42c5
|
fix : develop_client_permission
|
6 years ago |
|
wangning
|
9ca8f47d09
|
Merge branch 'develop_client_permission' of https://git.royalpay.com.au/git/royalv2.manage into develop_client_permission
|
6 years ago |
|
yuan
|
0a13bcd876
|
fix BD Commissions
|
6 years ago |
|
wangning
|
5ad385d8af
|
Merge branch 'develop' into develop_client_permission
|
6 years ago |
|
luoyang14z7
|
93ae3a7275
|
fix : develop_client_permission
|
6 years ago |
|
luoyang14z7
|
77e0bc1044
|
Merge remote-tracking branch 'work/develop_client_permission' into develop_client_permission
|
6 years ago |
|
luoyang14z7
|
2cec4309b5
|
fix : develop_client_permission
|
6 years ago |
|
wangning
|
71303e4629
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
wangning
|
6e049b7dcb
|
add images
|
6 years ago |
|
luoyang14z7
|
9e5e07daef
|
add : addPartner Auto Permission_Modules_Client
|
6 years ago |
|
eason
|
9d39e2cad6
|
fix
|
6 years ago |
|
wangning
|
9448ee6bb2
|
add permission check
|
6 years ago |
|
yuan
|
0e5e7270dc
|
fix BD Commissions
|
6 years ago |
|
wangning
|
ac472773f6
|
update
|
6 years ago |
|
wangning
|
2b3671a8af
|
merge
|
6 years ago |
|
wangning
|
fdab9c1d4c
|
Merge branch 'develop' into develop_client_permission
|
6 years ago |
|
luoyang14z7
|
1adf649076
|
add : partner Permission
|
6 years ago |
|
wangning
|
2de776e4ca
|
update
|
6 years ago |
|
yuan
|
c86e760dc8
|
fix BD Commissions
|
6 years ago |
|
eason
|
ac40e858da
|
fix bd commission
|
6 years ago |
|
wangning
|
4b53fee85c
|
update
|
6 years ago |
|
wangning
|
6b429eddb9
|
update
|
6 years ago |
|
wangning
|
208ac577c3
|
update
|
6 years ago |
|
wangning
|
cd50cbf719
|
add cache clearing
|
6 years ago |
|
wangning
|
6c752a3e0b
|
add client permission page
|
6 years ago |
|
yuan
|
9b031f73bb
|
fix BD Commissions
|
6 years ago |
|
wangning
|
9d50f0c687
|
tmp
|
6 years ago |
|
wangning
|
dfdb0bcac2
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
wangning
|
33c477a30c
|
fixedDocument
|
6 years ago |
|
wangning
|
80332ebeac
|
tmp
|
6 years ago |
|
wangning
|
36cac76a91
|
tmp
|
6 years ago |
|
eason
|
216c4d072c
|
fix
|
6 years ago |
|
yuan
|
a4fb797cf0
|
fix bug
|
6 years ago |
|
eason
|
103ca68c2d
|
fix
|
6 years ago |
|
luoyang14z7
|
6454b39f91
|
注释auto add partner
|
6 years ago |
|
luoyang14z7
|
1ecbc4894f
|
Merge branch 'devtools' into develop
|
6 years ago |
|
eason
|
309568e67f
|
fix
|
6 years ago |
|
luoyang14z7
|
ec3139d99c
|
devtools:addaliexport
|
6 years ago |
|
luoyang14z7
|
9e9f472f3d
|
devtools : add
|
6 years ago |
|
luoyang14z7
|
f70ead46a9
|
devtools
|
6 years ago |
|
yuan
|
1781257140
|
fix bug
|
6 years ago |
|
yuan
|
479009d671
|
fix bug
|
6 years ago |
|
yuan
|
4ba4599b06
|
fix bug
|
6 years ago |
|
yuan
|
a22d860bd4
|
fix bug
|
6 years ago |
|
yuan
|
d163eb9949
|
增加hf pay intro
|
6 years ago |
|
wangning
|
750a821917
|
update
|
6 years ago |
|
eason
|
dceadcfa6f
|
fix
|
6 years ago |
|
yuan
|
e598d77925
|
增加hfindustry
|
6 years ago |
|
eason
|
20360ade11
|
fix hf css
|
6 years ago |
|
eason
|
573e3da805
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
eason
|
6c1497b81e
|
fix hf css
|
6 years ago |
|
wangning
|
62e2850ce8
|
add hf apidoc
|
6 years ago |
|
wangning
|
ab085e657d
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
eason
|
212f9411d7
|
fix hf css
|
6 years ago |
|
eason
|
877163f09c
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
eason
|
91bcf7f9b3
|
fix hf
|
6 years ago |
|
wangning
|
7979e2e662
|
add hf apidoc
|
6 years ago |
|
yuan
|
e0ffd52989
|
Merge branch '6/29' into develop
|
6 years ago |
|
yuan
|
a498e4dcd4
|
fix bug
|
6 years ago |
|
yuan
|
d2b8fe4109
|
Merge branch 'fix_6/29' into develop
|
6 years ago |
|
yuan
|
f06271cd09
|
修改自助申请列表bug
|
6 years ago |
|
eason
|
0fe284cff8
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
eason
|
3d6e0fa003
|
fix
|
6 years ago |
|
yuan
|
410d1519de
|
fix html
|
6 years ago |
|
yuan
|
744a9b8463
|
Merge branch 'local_HF' into develop
|
6 years ago |
|
wangning
|
caab7a5c1c
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
d83a5d5a32
|
rollback point
|
6 years ago |
|
yuan
|
7e490fa7cd
|
add gateway 14
|
6 years ago |
|
eason
|
3d01808106
|
fix
|
6 years ago |
|
eason
|
3ab85dd480
|
fix
|
6 years ago |
|
yuan
|
62ad8b34f0
|
Merge branch 'develop' into local_HF
|
6 years ago |
|
yuan
|
3b399f69c6
|
fix html bug
|
6 years ago |
|
yuan
|
66ba4c7074
|
add getaway 14
|
6 years ago |
|
yuan
|
0be969f168
|
fix bug
|
6 years ago |
|
yuan
|
cbb7ac69a4
|
add getaway 14
|
6 years ago |
