6342 Commits (9e68e40200566657ae6dec123bc3e11802c0e2d0)

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
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