elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,426 Commits
1 Branch
0 Tags
173 MiB
Commit Graph

6362 Commits (a865b9d669cd8453dad4933765b7ad5727aaabd4)

Author SHA1 Message Date
zhengyongxing 2366a215a2 奖惩先去除限制逻辑
zhengyongxing b7c671ef1c 结算单汇总功能提交
chenzhi c45d82ff75 取消打款查看
zhengyongxing 99acaed972 公会信息登记功能补充
zhengyongxing eb6e027ef7 汇总结算单导出功能补充
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
zhengyongxing a199a12d4b 工会信息bug修改
zhengyongxing 64a565d908 1.28功能提交
zhengyongxing 0fe7e58c61 市场业绩离职功能提交导出修正
zhengyongxing c9ef39ada9 市场业绩离职功能提交导出修正
zhengyongxing d3e9f113ba 市场业绩离职功能提交导出修正
廖金灵 c7a22ce7dd Merge pull request '特殊补点导出修正' () from feature/add_item_two into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/89
郑永星 6c6f458d8b Merge pull request '特殊补点导出修正' () from feature/add_item_two into release 
特殊补点导出修正
zhengyongxing 7054f82fde 特殊补点导出修正
zhengyongxing 6e767a739c 市场业绩功能提交
郑永星 5ce0be3fe2 Merge pull request '公会信息登记信息补充' () from feature/add_item into release 
公会信息登记信息补充
zhengyongxing 3beeb81063 公会信息登记信息补充
郑永星 fa3943cda4 Merge pull request '公会信息登记信息补充' () from feature/add_item into release 
公会信息登记信息补充
zhengyongxing e0430cfb46 公会信息登记信息补充
郑永星 f4ff2c9666 Merge pull request '公会信息登记信息补充' () from feature/add_item into release 
公会信息登记信息补充
zhengyongxing f923f4d667 公会信息登记信息补充
陈志 55e29b571c Merge pull request 'feature/more_finance_20201211' () from feature/more_finance_20201211 into release 
优化公式
chenzhi 174219d9d5 优化公式
chenzhi 197e129f04 优化结算比例公式
郑永星 9ed794a56c Merge pull request 'feature/add_item' () from feature/add_item into release 
公会信息录入功能添加
zhengyongxing e775701c78 公会信息登记导出补充
zhengyongxing 9fceedd10e 模板下载功能添加
zhengyongxing 07ee17ca1d 公会信息录入功能添加
ELF 3dfc92ecc3 修改下载超时
chenzhi 170895055e 优化重算
zhengyongxing 667c43dc5c 市场业绩上月业绩绩效百分比比对
zhengyongxing b073f3e8cd 特殊补点编辑修改
zhengyongxing fecb58efdd 特殊补点编辑修改
chenzhi 6dd2558350 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211
chenzhi 3a629d63ea 优化结算人
tping 32d3160320 Merge branch 'feature/add_item' into hotfix/company_bug
zhengyongxing a641ff2526 上游公司分页修改
tping 8897a87342 甲乙方公司
廖金灵 5c119e2d76 Merge pull request '优化登陆' () from feature/more_finance_20201211 into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/68
chenzhi e6e408845b 优化cw只能登陆子系统
chenzhi 8323fafd30 优化只读账号
chenzhi 343ecc8587 优化登陆
廖金灵 54266852cc Merge pull request 'feature/more_finance_20201211' () from feature/more_finance_20201211 into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/67
chenzhi 12f4cda850 优化商户筛选
chenzhi 36e9125363 新增测试订单
chenzhi 96c937b7d3 优化日志
chenzhi c85e9a831f 优化消息异步
张谷成 79872bbaf7 Merge pull request '优化' () from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/64
tping 5775e7f02e 优化
chenzhi 14bb68b82e 优化业绩提成
张谷成 83148cd777 Merge pull request '优化' () from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/63
tping 9f329b7c34 优化
chenzhi df2da60986 优化市场部毛利
张谷成 5410a1cb2e Merge pull request '时间格式' () from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/61
tping 98ebb36aa3 时间格式
chenzhi 1b0124606a 优化市场结算脚本
张谷成 049f08af72 Merge pull request '优化' () from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/59
tping e3f020965d 优化
张谷成 5de3b95d54 Merge pull request '优化' () from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/58
tping b4c3b64fb0 优化
张谷成 2123ad9ef4 Merge pull request '优化' () from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/57
tping e57a5f8e50 优化
chenzhi 382f2527a0 优化新增条件
张谷成 a97e94fc21 Merge pull request '1' () from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/56
tping ee34cc86f5 1
郑永星 a6812d26e4 Merge pull request '短信验证万能验证码注释' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/55
chenzhi c5bc599289 优化游戏统计
zhengyongxing f5e2adb860 短信验证万能验证码注释
chenzhi 813aebfd64 优化统计
郑永星 c62ad6e69d Merge pull request '12.28功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/54
zhengyongxing 9c0006ef45 12.28功能提交
郑永星 a9aca61c73 Merge pull request '12.28功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/53
zhengyongxing f855835501 12.28功能提交
chenzhi 7ccf5e5857 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211
郑永星 444cff5f64 Merge pull request '12.28功能提交' () from feature/add_item into release 
12.28功能提交
zhengyongxing d1b0ec55a8 12.28功能提交
郑永星 1496fa349a Merge pull request '12.28功能提交' () from feature/add_item into release 
12.28功能提交
zhengyongxing 0293fd7ff1 12.28功能提交
chenzhi f0829e84cc 优化统计
zhengyongxing bb73235874 12.28功能提交
郑永星 12434fb840 Merge pull request 'feature/add_item' () from feature/add_item into release 
12.28功能提交
chenzhi be8a30a2e8 合并
chenzhi b1a34cc9a0 优化不打款汇总
zhengyongxing e84ce56293 12.28功能提交
chenzhi 19f7406298 优化结算
万盟天下 459026d842 Merge pull request '修改bug' () from feature/leniu_testing_resource into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/49
ELF a70bffaee3 修改bug
万盟天下 4917d4806f Merge pull request '调试bug' () from feature/leniu_testing_resource into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/48
ELF 4f4929ad72 修改
万盟天下 9ded6cb0bd Merge pull request '剑仙诀添加资源发放接口' () from feature/leniu_testing_resource into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/47
chenzhi 6aeb73b759 优化财务汇总
ELF 932a082134 剑仙诀添加资源发放接口
chenzhi 90de336434 优化数据
zhengyongxing 08d235c03a 12.28功能提交
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
chenzhi b6c87bfefe 优化首页
张谷成 1c1ef2e6a9 Merge pull request 'feature/1228zgc' () from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/46
郑永星 cd2d9b3bc2 Merge pull request '12.28功能提交' () from feature/update_payment into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/44
zhengyongxing e0f17ea195 12.28功能提交
chenzhi 0e54b1c376 优化渠道和测试服订单