zhengyongxing
|
3c166a913e
|
Merge branch 'feature/update_payment' into feature/add_item
# Conflicts:
# Application/Admin/Controller/CompanyStatementOfflineController.class.php
# Application/Admin/Controller/StatementMangementController.class.php
# Application/Payment/Controller/PaymentController.class.php
# Application/Payment/View/Payment/lists.html
# Data/update.sql
|
4 years ago |
zhengyongxing
|
e0f17ea195
|
12.28功能提交
|
4 years ago |
zhengyongxing
|
d0ee96f7b5
|
12.28功能提交
|
4 years ago |
zhengyongxing
|
ac70fd3f79
|
12.28功能提交
|
4 years ago |
zhengyongxing
|
f4027b75b3
|
12.28功能提交
|
4 years ago |
zhengyongxing
|
eb8478fbb7
|
12.28功能提交
|
4 years ago |
zhengyongxing
|
08153a8359
|
12.28功能提交
|
4 years ago |
zhengyongxing
|
ffa78964ec
|
12.28功能提交
|
4 years ago |
zhengyongxing
|
29e8421266
|
12.28功能提交
|
4 years ago |
zhengyongxing
|
4f2f18ad91
|
12.28功能提交
|
4 years ago |
zhengyongxing
|
82592dd457
|
12.28功能提交
|
4 years ago |
zhengyongxing
|
c8914800c7
|
12.28功能提交
|
4 years ago |
zhengyongxing
|
c716535975
|
12.28功能提交
|
4 years ago |
zhengyongxing
|
552a6f8181
|
12.28功能提交
|
4 years ago |
zhengyongxing
|
6a86a5e76f
|
12.18功打款能提交
|
4 years ago |
zhengyongxing
|
8a6191810b
|
12.18功打款能提交
|
4 years ago |
zhengyongxing
|
7c4e0e7521
|
12.18功能提交
|
4 years ago |
zhengyongxing
|
8430fa1813
|
12.18功能提交
|
4 years ago |
廖金灵
|
cd46d4c685
|
Merge pull request '刷新' (#39) from hotfix/1211bug into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/39
|
4 years ago |
tping
|
6e63176176
|
刷新
|
4 years ago |
廖金灵
|
5dbf826f0d
|
Merge pull request 'hotfix/1211bug' (#37) from hotfix/1211bug into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/37
|
4 years ago |
tping
|
1dbc61a602
|
1
|
4 years ago |
tping
|
858e929199
|
甲乙方公司
|
4 years ago |
tping
|
304c59be10
|
甲乙方公司
|
4 years ago |
tping
|
08df25eab3
|
展示错误
|
4 years ago |
廖金灵
|
feb46d1954
|
Merge pull request 'feature/add_item_two' (#33) from feature/add_item_two into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/33
|
4 years ago |
zhengyongxing
|
87c6c71d0a
|
汇总bug修改
|
4 years ago |
zhengyongxing
|
699449a702
|
未结算数据的补充
|
4 years ago |
zhengyongxing
|
0c49d1d655
|
Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/add_item_two
|
4 years ago |
zhengyongxing
|
c30e396b2c
|
未结算数据的补充
|
4 years ago |
zhengyongxing
|
32abdbb390
|
汇总统计修改
|
4 years ago |
廖金灵
|
fb130fe767
|
Merge pull request '优化统计' (#28) from hotfix/finance_bug_20201222 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/28
|
4 years ago |
chenzhi
|
fc75b7d81d
|
优化统计
|
4 years ago |
廖金灵
|
3389ba2720
|
Merge pull request '优化财务汇总' (#27) from hotfix/20201222_fiance_bug into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/27
|
4 years ago |
chenzhi
|
79588d52e8
|
优化财务汇总
|
4 years ago |
廖金灵
|
e1a8b7b23e
|
Merge pull request '后台结算功能优化' (#26) from release into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/26
|
4 years ago |
ELF
|
9f61cdade9
|
Merge branch 'master' of 8.136.139.249:wmtx/platform into release
|
4 years ago |
郑永星
|
9d93f9d56f
|
Merge pull request '未结算数据的补充' (#25) from feature/add_item into release
未结算数据的补充
|
4 years ago |
zhengyongxing
|
77678249bf
|
未结算数据的补充
|
4 years ago |
郑永星
|
bbfc5f64b8
|
Merge pull request 'feature/add_item' (#24) from feature/add_item into release
未结算数据的补充
|
4 years ago |
zhengyongxing
|
0ff4d0c551
|
未结算数据的补充
|
4 years ago |
zhengyongxing
|
84efc4d76d
|
未结算数据的补充
|
4 years ago |
郑永星
|
6699ce1045
|
Merge pull request '未结算数据的补充' (#23) from feature/add_item into release
未结算数据的补充
|
4 years ago |
zhengyongxing
|
f13ee0583c
|
未结算数据的补充
|
4 years ago |
廖金灵
|
ace44195c5
|
Merge pull request 'hotfix/and_bug' (#22) from hotfix/and_bug into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/22
|
4 years ago |
chenzhi
|
78451f0551
|
消除打印信息
|
4 years ago |
chenzhi
|
96ead18ff6
|
优化打印
|
4 years ago |
chenzhi
|
7abcd38f36
|
解决推广公司bug
|
4 years ago |
廖金灵
|
3bedf259a0
|
Merge pull request 'feature/1211' (#21) from feature/1211 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/21
|
4 years ago |
廖金灵
|
bc52f043c6
|
Merge pull request '优化下游推广公司搜索' (#19) from hotfix/and_bug into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/19
|
4 years ago |