2141 Commits (01a0d7c71766092d09f38689bb3f8c238e998872)

Author SHA1 Message Date
zhengyongxing 1ec35eeb32 2.28号功能提交 4 years ago
chenzhi 7756efe859 优化结算单显示 4 years ago
zhengyongxing 0be51f4d62 2.28号功能提交 4 years ago
郑永星 0f39caaf60 Merge pull request 'feature/add_item' (#177) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/177
4 years ago
zhengyongxing c6587b61a5 2.28号功能提交 4 years ago
zhengyongxing 8e28b1c4ad 2.28号功能提交 4 years ago
郑永星 dfdcedea38 Merge pull request '2.28号功能提交' (#176) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/176
4 years ago
zhengyongxing 016c2e11bd 2.28号功能提交 4 years ago
chenzhi a889417f5a Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 4 years ago
chenzhi 0b4e9fa9a1 优化重算 4 years ago
郑永星 23147ac0cc Merge pull request '2.28号功能提交' (#173) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/173
4 years ago
zhengyongxing 4425750972 2.28号功能提交 4 years ago
chenzhi b75bcdbb1c 新增上游导出查看 4 years ago
郑永星 b7a120c56a Merge pull request '2.10号功能提交' (#172) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/172
4 years ago
zhengyongxing c2bfcd39b6 2.10号功能提交 4 years ago
廖金灵 81ac1baaf1 Merge pull request '额外额度计算修改' (#167) from feature/TestingResource-0205 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/167
4 years ago
liyang e008e14046 额外额度计算修改 4 years ago
廖金灵 e84f8c174a Merge pull request '优化' (#165) from feature/testing_quota_up into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/165
4 years ago
ELF 8a815af691 优化 4 years ago
ly 4a69622b01 额外额度备注信息显示 4 years ago
chenzhi c936ee528c 优化取消时间导出错误 4 years ago
liyang 769a6974ab 额外额度、申请批次修改 4 years ago
郑永星 84d6d1c145 Merge pull request '2.7号功能提交' (#161) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/161
4 years ago
zhengyongxing 6dce14520e 2.7号功能提交 4 years ago
郑永星 4e6e402f71 Merge pull request '2.7号功能提交' (#158) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/158
4 years ago
zhengyongxing 347facea89 2.7号功能提交 4 years ago
郑永星 bf2851b11d Merge pull request '2.7号功能提交' (#157) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/157
4 years ago
zhengyongxing fec3c76ac1 2.7号功能提交 4 years ago
chenzhi 3997bc4b17 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 4 years ago
chenzhi 2f90e19f1f 移除个人导出打款状态 4 years ago
chenzhi b592554501 Merge branch 'feature/testing_daily_count' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 4 years ago
郑永星 12eb8aa9f0 Merge pull request '2.7号功能提交' (#153) from feature/add_item into release
2.7号功能提交
4 years ago
zhengyongxing 53ba2c7698 2.7号功能提交 4 years ago
陈志 a28c71ecb8 Merge pull request 'feature/testing_daily_count' (#152) from feature/testing_daily_count into release
优化测试统计导出
4 years ago
chenzhi 290b48dc3b 优化测试统计导出 4 years ago
chenzhi e2882cc5aa 新增线上线下结算统计 4 years ago
chenzhi 9cfe8abe68 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 4 years ago
chenzhi 4a80ee2f87 优化公会统计说明 4 years ago
chenzhi 35c25119e4 优化管理后台线下打款合计字段 4 years ago
ELF a355c2b579 优化 4 years ago
elf@home 23643d2e0b 修改 4 years ago
郑永星 42550a32fb Merge pull request '1.28功能提交' (#131) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/131
4 years ago
zhengyongxing 199b5e0f51 1.28功能提交 4 years ago
郑永星 e9be27136f Merge pull request '1.28功能提交' (#121) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/121
4 years ago
zhengyongxing 77f7eda10f 1.28功能提交 4 years ago
郑永星 272eca3f9a Merge pull request '1.28功能提交' (#119) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/119
4 years ago
zhengyongxing 7a2e4d9033 1.28功能提交 4 years ago
郑永星 5a232e6bb6 Merge pull request '1.28功能提交' (#116) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/116
4 years ago
zhengyongxing 3c566fb2ae 1.28功能提交 4 years ago
tping c59b8d1419 导出所有 4 years ago
tping 5c22a252a3 Merge branch 'release' into feature/0128 4 years ago
tping a5b977aa00 导出所有 4 years ago
陈志 14ba644fda Merge pull request '优化提醒名词' (#111) from feature/testing_daily_count into release
Re优化提醒名词
4 years ago
chenzhi 9d9ef7a79b 优化提醒名词 4 years ago
陈志 b690ef68a2 Merge pull request 'feature/testing_daily_count' (#109) from feature/testing_daily_count into release
优化菜单适配
4 years ago
chenzhi b19853edd3 优化菜单 4 years ago
zhengyongxing 8a49578cc4 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/add_item 4 years ago
zhengyongxing 104051d90f 1.28功能提交 4 years ago
陈志 0b55550a62 Merge pull request 'feature/testing_daily_count' (#107) from feature/testing_daily_count into release
优化首页提醒
4 years ago
chenzhi 13d0c6fa59 优化首页提醒 4 years ago
chenzhi 2658c50c3a 新增测试资源统计 4 years ago
zhengyongxing f710113820 1.28功能提交 4 years ago
zhengyongxing ee463829d2 1.28功能提交 4 years ago
zhengyongxing deff984922 1.28功能提交 4 years ago
zhengyongxing eb6e027ef7 汇总结算单导出功能补充 4 years ago
zhengyongxing 64a565d908 1.28功能提交 4 years ago
zhengyongxing 0fe7e58c61 市场业绩离职功能提交导出修正 4 years ago
zhengyongxing d3e9f113ba 市场业绩离职功能提交导出修正 4 years ago
zhengyongxing 6e767a739c 市场业绩功能提交 4 years ago
zhengyongxing 3beeb81063 公会信息登记信息补充 4 years ago
zhengyongxing e0430cfb46 公会信息登记信息补充 4 years ago
zhengyongxing f923f4d667 公会信息登记信息补充 4 years ago
zhengyongxing 9fceedd10e 模板下载功能添加 4 years ago
zhengyongxing 07ee17ca1d 公会信息录入功能添加 4 years ago
zhengyongxing b073f3e8cd 特殊补点编辑修改 4 years ago
zhengyongxing fecb58efdd 特殊补点编辑修改 4 years ago
tping 8897a87342 甲乙方公司 4 years ago
廖金灵 54266852cc Merge pull request 'feature/more_finance_20201211' (#67) from feature/more_finance_20201211 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/67
4 years ago
chenzhi 12f4cda850 优化商户筛选 4 years ago
张谷成 83148cd777 Merge pull request '优化' (#63) from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/63
4 years ago
tping 9f329b7c34 优化 4 years ago
张谷成 049f08af72 Merge pull request '优化' (#59) from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/59
4 years ago
tping e3f020965d 优化 4 years ago
张谷成 5de3b95d54 Merge pull request '优化' (#58) from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/58
4 years ago
tping b4c3b64fb0 优化 4 years ago
张谷成 2123ad9ef4 Merge pull request '优化' (#57) from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/57
4 years ago
tping e57a5f8e50 优化 4 years ago
chenzhi 7ccf5e5857 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211 4 years ago
郑永星 1496fa349a Merge pull request '12.28功能提交' (#51) from feature/add_item into release
12.28功能提交
4 years ago
zhengyongxing 0293fd7ff1 12.28功能提交 4 years ago
郑永星 12434fb840 Merge pull request 'feature/add_item' (#50) from feature/add_item into release
12.28功能提交
4 years ago
chenzhi be8a30a2e8 合并 4 years ago
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
张谷成 1c1ef2e6a9 Merge pull request 'feature/1228zgc' (#46) from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/46
4 years ago
chenzhi 0e54b1c376 优化渠道和测试服订单 4 years ago
郑永星 ad7dc1f46d Merge pull request 'feature/update_payment' (#40) from feature/update_payment into release
12.28功能提交
4 years ago
zhengyongxing ffa78964ec 12.28功能提交 4 years ago
zhengyongxing 4f2f18ad91 12.28功能提交 4 years ago
zhengyongxing c716535975 12.28功能提交 4 years ago
chenzhi 9ab8454970 优化结算汇总 4 years ago