3160 Commits (0aa3c514d783d809e06667826a89bacda463c382)

Author	SHA1	Message	Date
ELF	9e68e40200	解决冲突	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
郑永星	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
郑永星	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
郑永星	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
zhengyongxing	99acaed972	公会信息登记功能补充	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	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
郑永星	f4ff2c9666	Merge pull request '公会信息登记信息补充' (#85) from feature/add_item into release ... 公会信息登记信息补充	4 years ago
zhengyongxing	f923f4d667	公会信息登记信息补充	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
chenzhi	170895055e	优化重算	4 years ago
zhengyongxing	667c43dc5c	市场业绩上月业绩绩效百分比比对	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	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