6406 Commits (926b8975f1db5846f47effd15c7b1c16b4a62e1b)

Author SHA1 Message Date
ELF 0aa3c514d7 优化 4 years ago
陈志 14ba644fda Merge pull request '优化提醒名词' (#111) from feature/testing_daily_count into release
Re优化提醒名词
4 years ago
chenzhi 9d9ef7a79b 优化提醒名词 4 years ago
陈志 98f9c61104 Merge pull request '优化排序' (#110) from feature/testing_daily_count into release
优化排序
4 years ago
chenzhi 746388dd00 优化排序 4 years ago
陈志 b690ef68a2 Merge pull request 'feature/testing_daily_count' (#109) from feature/testing_daily_count into release
优化菜单适配
4 years ago
chenzhi 3f88e7dc6f 优化菜单适配 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
zhengyongxing c7730d5d06 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/add_item 4 years ago
ELF 9e68e40200 解决冲突 4 years ago
chenzhi 2658c50c3a 新增测试资源统计 4 years ago
ELF 531b94bae8 版本 4 years ago
郑永星 f4bb1cc5e2 Merge pull request '1.28功能提交' (#105) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/105
4 years ago
zhengyongxing f710113820 1.28功能提交 4 years ago
郑永星 fec6edf48c Merge pull request '1.28功能提交' (#104) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/104
4 years ago
zhengyongxing 14be887ebb 1.28功能提交 4 years ago
郑永星 747082fc0d 1.28功能提交
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/103
4 years ago
zhengyongxing ee463829d2 1.28功能提交 4 years ago
chenzhi 2e2ff8e1d7 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 4 years ago
chenzhi 027c803343 优化打款备注 4 years ago
郑永星 31d831e39a Merge pull request '1.28功能提交' (#101) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/101
4 years ago
zhengyongxing 0080dc75d7 1.28功能提交 4 years ago
chenzhi a845ff4d84 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 4 years ago
elf@home 34e25f293a 推广员添加每级id 4 years ago
郑永星 6c1c82b649 Merge pull request '1.28功能提交' (#100) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/100
4 years ago
zhengyongxing 58e8efbd7f 1.28功能提交 4 years ago
zhengyongxing deff984922 1.28功能提交 4 years ago
廖金灵 e31fec8a5c Merge pull request '修改' (#98) from feature/jpck into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/98
4 years ago
ELF d08df7feba 修改 4 years ago
陈志 3df6e7246a Merge pull request 'feature/finance_payment_20210115' (#97) from feature/finance_payment_20210115 into release
新增线上转线下打款
4 years ago
chenzhi 684ea81b6a 新增线上转线下打款 4 years ago
廖金灵 293f2941be Merge pull request '剑破长空测试资源接口' (#96) from feature/jpck into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/96
4 years ago
ELF 07c95d2ea7 剑破长空测试资源 4 years ago
chenzhi 7617ee8a4c 优化支付导出 4 years ago
chenzhi 28eedef4ed 优化支付宝信息更新 4 years ago
chenzhi 1427e7e744 新增更新支付信息功能ok 4 years ago
郑永星 af3a48f0d8 Merge pull request '奖惩限制逻辑修改' (#94) from hotfix/reward_limit into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/94
4 years ago
zhengyongxing 508f4abef1 奖惩限制逻辑修改 4 years ago
zhengyongxing 963e806218 奖惩限制逻辑修改 4 years ago
zhengyongxing 14a0e564e1 Merge branch 'release' of 8.136.139.249:wmtx/platform into hotfix/rewardlimit 4 years ago
zhengyongxing 2366a215a2 奖惩先去除限制逻辑 4 years ago
zhengyongxing b7c671ef1c 结算单汇总功能提交 4 years ago
chenzhi c45d82ff75 取消打款查看 4 years ago
zhengyongxing 99acaed972 公会信息登记功能补充 4 years ago
zhengyongxing eb6e027ef7 汇总结算单导出功能补充 4 years ago
zhengyongxing 6243ca60cf Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/add_item_two
 Conflicts:
	Application/Admin/Controller/SocietyInfoController.class.php
	Public/static/area.js
4 years ago
zhengyongxing a199a12d4b 工会信息bug修改 4 years ago
zhengyongxing 64a565d908 1.28功能提交 4 years ago
zhengyongxing 0fe7e58c61 市场业绩离职功能提交导出修正 4 years ago
zhengyongxing c9ef39ada9 市场业绩离职功能提交导出修正 4 years ago
zhengyongxing d3e9f113ba 市场业绩离职功能提交导出修正 4 years ago
廖金灵 c7a22ce7dd Merge pull request '特殊补点导出修正' (#89) from feature/add_item_two into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/89
4 years ago
郑永星 6c6f458d8b Merge pull request '特殊补点导出修正' (#88) from feature/add_item_two into release
特殊补点导出修正
4 years ago
zhengyongxing 7054f82fde 特殊补点导出修正 4 years ago
zhengyongxing 6e767a739c 市场业绩功能提交 4 years ago
郑永星 5ce0be3fe2 Merge pull request '公会信息登记信息补充' (#87) from feature/add_item into release
公会信息登记信息补充
4 years ago
zhengyongxing 3beeb81063 公会信息登记信息补充 4 years ago
郑永星 fa3943cda4 Merge pull request '公会信息登记信息补充' (#86) from feature/add_item into release
公会信息登记信息补充
4 years ago
zhengyongxing e0430cfb46 公会信息登记信息补充 4 years ago
郑永星 f4ff2c9666 Merge pull request '公会信息登记信息补充' (#85) from feature/add_item into release
公会信息登记信息补充
4 years ago
zhengyongxing f923f4d667 公会信息登记信息补充 4 years ago
陈志 55e29b571c Merge pull request 'feature/more_finance_20201211' (#83) from feature/more_finance_20201211 into release
优化公式
4 years ago
chenzhi 174219d9d5 优化公式 4 years ago
chenzhi 197e129f04 优化结算比例公式 4 years ago
郑永星 9ed794a56c Merge pull request 'feature/add_item' (#82) from feature/add_item into release
公会信息录入功能添加
4 years ago
zhengyongxing e775701c78 公会信息登记导出补充 4 years ago
zhengyongxing 9fceedd10e 模板下载功能添加 4 years ago
zhengyongxing 07ee17ca1d 公会信息录入功能添加 4 years ago
ELF 3dfc92ecc3 修改下载超时 4 years ago
chenzhi 170895055e 优化重算 4 years ago
zhengyongxing 667c43dc5c 市场业绩上月业绩绩效百分比比对 4 years ago
zhengyongxing b073f3e8cd 特殊补点编辑修改 4 years ago
zhengyongxing fecb58efdd 特殊补点编辑修改 4 years ago
chenzhi 6dd2558350 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211 4 years ago
chenzhi 3a629d63ea 优化结算人 4 years ago
tping 32d3160320 Merge branch 'feature/add_item' into hotfix/company_bug 4 years ago
zhengyongxing a641ff2526 上游公司分页修改 4 years ago
tping 8897a87342 甲乙方公司 4 years ago
廖金灵 5c119e2d76 Merge pull request '优化登陆' (#68) from feature/more_finance_20201211 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/68
4 years ago
chenzhi e6e408845b 优化cw只能登陆子系统 4 years ago
chenzhi 8323fafd30 优化只读账号 4 years ago
chenzhi 343ecc8587 优化登陆 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
chenzhi 36e9125363 新增测试订单 4 years ago
chenzhi 96c937b7d3 优化日志 4 years ago
chenzhi c85e9a831f 优化消息异步 4 years ago
张谷成 79872bbaf7 Merge pull request '优化' (#64) from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/64
4 years ago
tping 5775e7f02e 优化 4 years ago
chenzhi 14bb68b82e 优化业绩提成 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
chenzhi df2da60986 优化市场部毛利 4 years ago
张谷成 5410a1cb2e Merge pull request '时间格式' (#61) from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/61
4 years ago
tping 98ebb36aa3 时间格式 4 years ago
chenzhi 1b0124606a 优化市场结算脚本 4 years ago