wangning
|
a5608059ea
|
update
|
9 years ago |
|
wangning
|
0fea884bd1
|
update
|
9 years ago |
|
wangning
|
d41232822f
|
update
|
9 years ago |
|
wangning
|
f6d92dde3a
|
update
|
9 years ago |
|
wangning
|
9bd674275f
|
update
|
9 years ago |
|
wangning
|
f14dbf84ae
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
9 years ago |
eason.qian
|
91bba5dea4
|
Merge remote-tracking branch 'origin/develop' into develop
|
9 years ago |
|
eason.qian
|
10bb3b1404
|
fix
|
9 years ago |
|
wangning
|
111073ba77
|
Merge branch 'master_contract_analysis' into develop
# Conflicts:
# src/db/modify.sql
# src/main/ui/manage.html
|
9 years ago |
|
wangning
|
69104c110c
|
update
|
9 years ago |
|
wangning
|
674235960d
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
9 years ago |
|
wangning
|
bf8b17a5dc
|
Merge branch 'master_rate_cache' into develop
|
9 years ago |
|
wangning
|
27c5d25eb6
|
delete manager manual_settle
|
9 years ago |
|
eason.qian
|
373f024a57
|
fix
|
9 years ago |
|
eason.qian
|
d3d4b633fb
|
fix
|
9 years ago |
|
wangning
|
3cf45ef0cc
|
Merge branch 'develop_manual_settle' into develop
# Conflicts:
# src/db/modify.sql
|
9 years ago |
yixian
|
3f513ead4e
|
Merge branch 'manualsettle' into develop
|
9 years ago |
|
yixian
|
f11ccbc7cd
|
details
|
9 years ago |
|
wangning
|
a2b36ec297
|
update
|
9 years ago |
|
wangning
|
243a085b44
|
add manual settle
|
9 years ago |
|
yixian
|
69ecf574bd
|
Merge branch 'manualsettle' into develop
|
9 years ago |
|
yixian
|
4c6fbed61c
|
client
|
9 years ago |
|
yixian
|
241586966d
|
Merge remote-tracking branch 'origin/develop' into develop
|
9 years ago |
|
yixian
|
de40d0d0ea
|
manual settle request
|
9 years ago |
|
eason.qian
|
f1049e7cd9
|
Merge remote-tracking branch 'origin/develop' into develop
|
9 years ago |
|
eason.qian
|
18db21c9f6
|
fix
|
9 years ago |
|
wangning
|
0a87728a96
|
update
|
9 years ago |
yuan
|
41bdbdfe3c
|
fix bug
|
9 years ago |
|
wangning
|
4d2a27c2ca
|
update
|
9 years ago |
|
wangning
|
caadaa605d
|
update
|
9 years ago |
|
wangning
|
1b462fd599
|
update
|
9 years ago |
|
wangning
|
9981c2b36f
|
add acts log
|
9 years ago |
|
wangning
|
b6daea5821
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
9 years ago |
|
yuan
|
c6ba497390
|
活动管理增加字段
|
9 years ago |
|
wangning
|
fbec5fbd56
|
update
|
9 years ago |
Tayl0r
|
8519c21dd6
|
Merge remote-tracking branch 'origin/master'
|
9 years ago |
|
Tayl0r
|
dd90c988fb
|
[Y] 翼支付清算日期
|
9 years ago |
|
eason.qian
|
2c313cbf65
|
Merge remote-tracking branch 'origin/develop' into develop
|
9 years ago |
|
eason.qian
|
4a78305160
|
fix
|
9 years ago |
|
wangning
|
176b69d685
|
update
|
9 years ago |
|
wangning
|
5ed445e8a9
|
mondelay 周一18点之前停止操作
|
9 years ago |
|
yuan
|
bc82d0f6b7
|
fix html
|
9 years ago |
|
yuan
|
432067e046
|
fix~
|
9 years ago |
|
yuan
|
92be3cf81a
|
fix html
|
9 years ago |
|
wangning
|
7ea1050366
|
update
|
9 years ago |
|
wangning
|
7171a225d8
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
9 years ago |
|
wangning
|
e319db47ef
|
unread add act info
|
9 years ago |
|
yuan
|
f8a17f97e9
|
fix html
|
9 years ago |
|
wangning
|
c4ec80955d
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
9 years ago |
|
wangning
|
c4f482af8e
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
9 years ago |
