6359 Commits (cd1f84fb378bf3093d9e82cacf51c84b7c235218)

Author	SHA1	Message	Date
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
张谷成	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	382f2527a0	优化新增条件	4 years ago
张谷成	a97e94fc21	Merge pull request '1' (#56) from feature/1228zgc into release ... Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/56	4 years ago
tping	ee34cc86f5	1	4 years ago
郑永星	a6812d26e4	Merge pull request '短信验证万能验证码注释' (#55) from feature/add_item into release ... Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/55	4 years ago
chenzhi	c5bc599289	优化游戏统计	4 years ago
zhengyongxing	f5e2adb860	短信验证万能验证码注释	4 years ago
chenzhi	813aebfd64	优化统计	4 years ago
郑永星	c62ad6e69d	Merge pull request '12.28功能提交' (#54) from feature/add_item into release ... Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/54	4 years ago
zhengyongxing	9c0006ef45	12.28功能提交	4 years ago
郑永星	a9aca61c73	Merge pull request '12.28功能提交' (#53) from feature/add_item into release ... Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/53	4 years ago
zhengyongxing	f855835501	12.28功能提交	4 years ago
chenzhi	7ccf5e5857	Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211	4 years ago
郑永星	444cff5f64	Merge pull request '12.28功能提交' (#52) from feature/add_item into release ... 12.28功能提交	4 years ago
zhengyongxing	d1b0ec55a8	12.28功能提交	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
chenzhi	f0829e84cc	优化统计	4 years ago
zhengyongxing	bb73235874	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
chenzhi	b1a34cc9a0	优化不打款汇总	4 years ago
zhengyongxing	e84ce56293	12.28功能提交	4 years ago
chenzhi	19f7406298	优化结算	4 years ago
万盟天下	459026d842	Merge pull request '修改bug' (#49) from feature/leniu_testing_resource into release ... Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/49	4 years ago
ELF	a70bffaee3	修改bug	4 years ago
万盟天下	4917d4806f	Merge pull request '调试bug' (#48) from feature/leniu_testing_resource into release ... Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/48	4 years ago
ELF	4f4929ad72	修改	4 years ago
万盟天下	9ded6cb0bd	Merge pull request '剑仙诀添加资源发放接口' (#47) from feature/leniu_testing_resource into release ... Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/47	4 years ago
chenzhi	6aeb73b759	优化财务汇总	4 years ago
ELF	932a082134	剑仙诀添加资源发放接口	4 years ago
chenzhi	90de336434	优化数据	4 years ago
zhengyongxing	08d235c03a	12.28功能提交	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
chenzhi	b6c87bfefe	优化首页	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
郑永星	cd2d9b3bc2	Merge pull request '12.28功能提交' (#44) from feature/update_payment into release ... Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/44	4 years ago
zhengyongxing	e0f17ea195	12.28功能提交	4 years ago
chenzhi	0e54b1c376	优化渠道和测试服订单	4 years ago
郑永星	11c7c542f8	Merge pull request '12.28功能提交' (#43) from feature/update_payment into release ... 12.28功能提交	4 years ago
zhengyongxing	d0ee96f7b5	12.28功能提交	4 years ago
郑永星	db487f1033	Merge pull request 'feature/update_payment' (#42) from feature/update_payment into release ... Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/42	4 years ago