eason
|
e5dc84fa50
|
Merge branch 'develop'
|
6 years ago |
|
eason
|
8a61e47a50
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
wangning
|
65baad8331
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
cfbf224f9d
|
add test
|
6 years ago |
|
wangning
|
584eeff188
|
tmp
|
6 years ago |
yuan
|
1650f51396
|
add 1、gateway_alipay_online开关,2、ali_sub_merchant_id 配置
|
6 years ago |
|
wangning
|
2203c4e869
|
Merge branch 'hotfix2' into develop
|
6 years ago |
|
wangning
|
0e65780bbe
|
update
|
6 years ago |
|
wangning
|
3d5cbc8994
|
Merge branch 'hotfix2' into develop
|
6 years ago |
|
wangning
|
e9b9f16909
|
update
|
6 years ago |
|
wangning
|
63bdc1ce24
|
tmp
|
6 years ago |
yixian
|
c8e711f660
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yixian
|
aec96b78d1
|
fix abafile
|
6 years ago |
|
yuan
|
debc6ea13c
|
增加取消订阅邮件管理
|
6 years ago |
|
wangning
|
bf6bd34e36
|
update
|
6 years ago |
|
wangning
|
0d9612e587
|
add config operation log
|
6 years ago |
|
wangning
|
d639c584fb
|
update
|
6 years ago |
|
eason
|
78ab90501b
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
wangning
|
c583d3054c
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
dfb700607f
|
init unsub mail
|
6 years ago |
|
yuan
|
431ad49dbc
|
隐藏account_no
|
6 years ago |
|
wangning
|
3395120f3c
|
update
|
6 years ago |
|
wangning
|
2cd21677b4
|
update
|
6 years ago |
|
wangning
|
54ee965213
|
add ali_sub_id
|
6 years ago |
|
wangning
|
968d367d6e
|
update
|
6 years ago |
|
wangning
|
bb55dec303
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
wangning
|
57d78195f9
|
update
|
6 years ago |
|
wangning
|
793f920e2b
|
update
|
6 years ago |
|
wangning
|
0933303468
|
update
|
6 years ago |
|
wangning
|
27996f9136
|
send notify filter address
|
6 years ago |
|
wangning
|
3186110157
|
update
|
6 years ago |
|
wangning
|
b7386bc81b
|
add unsub mail list
|
6 years ago |
|
wangning
|
4cb5afca1a
|
Merge branch 'hotfixa' into develop
|
6 years ago |
|
wangning
|
45ab7acee0
|
update
|
6 years ago |
|
wangning
|
10b60ec4a3
|
tmp
|
6 years ago |
|
wangning
|
6728986797
|
update
|
6 years ago |
|
wangning
|
8de77da823
|
update
|
6 years ago |
|
wangning
|
605acc6ebc
|
update
|
6 years ago |
|
wangning
|
d7db6a1229
|
update
|
6 years ago |
|
eason
|
fb2bb72e61
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/db/modify.sql
|
6 years ago |
|
wangning
|
e27ec59a6a
|
update
|
6 years ago |
|
wangning
|
eff977631e
|
update
|
6 years ago |
|
wangning
|
7af74cb593
|
add apply source
|
6 years ago |
|
wangning
|
531ffd16b6
|
update
|
6 years ago |
|
wangning
|
f765d896d3
|
Merge branch 'develop'
|
6 years ago |
|
wangning
|
ed28003e69
|
update
|
6 years ago |
|
eason
|
80caa6db03
|
Merge branch 'develop'
# Conflicts:
# src/db/modify.sql
|
6 years ago |
|
wangning
|
ffa9dbe96e
|
merge conflict
|
6 years ago |
|
wangning
|
98101df7ac
|
update
|
6 years ago |
|
wangning
|
349083a52c
|
Merge branch 'hotfix' into develop
|
6 years ago |
