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 |
kira
|
2416999408
|
update
|
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 |
|
kira
|
59bb6d7160
|
tmp
|
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 |
|
kira
|
0c76b953a6
|
init
|
6 years ago |
|
luoyang14z7
|
c87a9bc10b
|
Merge branch 'actChairty' into develop_client_permission
|
6 years ago |
|
luoyang14z7
|
0bbd6b8297
|
fix : develop_act_Chairty
|
6 years ago |
|
luoyang14z7
|
df14273f57
|
fix : develop_act_Chairty
|
6 years ago |
|
luoyang14z7
|
56a52bda6d
|
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
|
329d8fab4d
|
maven
|
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
|
2f8e0d044b
|
roll back
|
6 years ago |
|
wangning
|
9d0ddc3768
|
update
|
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 |
