elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,283 Commits
1 Branch
0 Tags
154 MiB
Commit Graph

7041 Commits (352a6052222fd2a72f9e9e9b50c1ec95387829c8)

Author SHA1 Message Date
chenzhi a9951bd657 优化保存
chenzhi 30d6f53582 优化渠道计算
chenzhi bb2656f207 优化代码
chenzhi 844a6d501e 新增打款账号编辑
廖金灵 0cacbd3cb7 Merge pull request 'hotfix/ymxj_testing_resource' () from hotfix/ymxj_testing_resource into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/312
ELF 6d5cd97811 优化
ELF 0c3ada79dc 优化
廖金灵 0ca0b8ab4f Merge pull request '优化' () from hotfix/ymxj_testing_resource into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/311
ELF 66af4f551a 优化
廖金灵 84c6612093 Merge pull request 'bug修复' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/310
zhengyongxing cd1fd63681 bug修复
ELF fea86b964c 优化
ELF 0dbc10498b 解决冲突
ELF 11b9ec62ba 优化
廖金灵 6abebc1a3c Merge pull request '乐牛添加测试资源' () from hotfix/leniu_testing_res into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/305
ELF 0888779250 优化
陈志 1521212db1 Merge pull request '新增频繁操作提示页面' () from feature/hom_defaultpage into release 
新增频繁操作提示页面
chenzhi 3a7b06977f 新增频繁操作提示页面
ELF 8964fef141 Merge branch 'hotfix/xyws_testing_resource' into release
ELF bb28142282 仙影无双测试资源
廖金灵 eb0e44418d Merge pull request 'hotfix/partab' () from hotfix/partab into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/298
ELF c1a71bd5f1 Merge branch 'master' into release
tping a0909c6c5b 甲乙方公司
廖金灵 834a4128d0 Merge pull request '推广后台访问限制' () from hotfix/shift_repeat_bug into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/297
廖金灵 8ed5ca3e4c Merge pull request '优化' () from hotfix/shift_repeat_bug into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/296
ELF 48274d2f50 优化
ELF c72229e6aa 优化
廖金灵 e270544df1 Merge pull request '推广后台每秒限制访问' () from hotfix/shift_repeat_bug into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/295
ELF 9904d85516 优化
廖金灵 a9fd28e38f Merge pull request 'feature/add_item' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/294
zhengyongxing b7d4e9002d 4.23号功能提交
郑永星 d1b570be2a Merge pull request '4.23号功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/293
zhengyongxing 83cc2aa6ec 4.23号功能提交
陈志 34fcfc7675 Merge pull request 'hotfix/fiance_statement_bug_20210420' () from hotfix/fiance_statement_bug_20210420 into release 
优化关联
chenzhi b257ee8754 优化游戏关联
郑永星 b79f567e0a Merge pull request '4.23号功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/291
zhengyongxing 1a2f0ab975 4.23号功能提交
chenzhi fa19156cfb 优化bug
郑永星 49a4caaba6 Merge pull request '4.23号功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/288
zhengyongxing 671419882f 4.23号功能提交
chenzhi aa0bcef724 Merge branch 'master' of 8.136.139.249:wmtx/platform into hotfix/fiance_statement_bug_20210420
廖金灵 56e28d216e Merge pull request '版本更新' () from release into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/285
chenzhi 7ef7e66a58 优化不弹框提醒
郑永星 cc201dbd41 Merge pull request '4.22号功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/284
zhengyongxing f2e56125fe 4.22号功能提交
郑永星 9f5463dd3d Merge pull request '4.22号功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/283
zhengyongxing 69566e1839 4.22号功能提交
zhengyongxing d314e6164a 4.22号功能提交
chenzhi 72f69bd079 优化提示
chenzhi 4dd36afd45 优化icon大小限制
chenzhi d5a8c97ad3 优化图片上传
chenzhi 537c496793 优化图片上传
chenzhi b71995aeeb Merge branch 'release' of 8.136.139.249:wmtx/platform into hotfix/fiance_statement_bug_20210420
廖金灵 8375c5f9bd Merge pull request '优化独立减罚' () from hotfix/fiance_statement_bug_20210420 into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/280
chenzhi c575d4f590 优化独立减罚
郑永星 b5e8cc4ecb Merge pull request '4.22号功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/279
zhengyongxing a5aa8ef744 4.22号功能提交
郑永星 d082a7dc98 Merge pull request '4.22号功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/277
zhengyongxing 8fb73e6fed 4.22号功能提交
ELF bfa0c5c5b8 迁移优化
陈志 6d03ea4942 Merge pull request 'feature/finance_payment_20210115' () from feature/finance_payment_20210115 into release 
新增退款统计
chenzhi 06202851c2 新增退款统计
chenzhi f349603e7c 新增游戏订单退款
郑永星 80fe58ee20 Merge pull request 'feature/add_item' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/275
zhengyongxing 9080d521fd 4.22号功能提交
ELF 35e879d084 优化
ELF 9eadb9e0c3 优化
liyang f32d51480f 玩家列表修改
廖金灵 f5566264d9 Merge pull request '特殊补点bug修改' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/272
zhengyongxing 72077477ed 特殊补点bug修改
chenzhi c0f98f71a5 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
zhengyongxing 65e0fda02f 工会统计bug修正
chenzhi 4166112252 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
zhengyongxing a48f0214c7 归属游戏上传
chenzhi 53ae4b0f0e Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
chenzhi 6d92d9e21c 优化菜单操作
chenzhi 17945097ce 优化导出
chenzhi a327627f85 优化行为日志导出
chenzhi bae615bac0 优化子站行为日志
chenzhi 6c9ae2332b 优化管理员添加
chenzhi bea2fa7003 优化管理组子站点功能
zhengyongxing 99d281b8e1 财务打款系统bug修复
zhengyongxing c772aa6854 财务打款系统bug修复
zhengyongxing c1c0e3ac14 财务打款系统bug修复
zhengyongxing 0d5ab01f32 财务打款系统bug修复
zhengyongxing 860d389700 财务打款系统bug修复
zhengyongxing f675357a2d 财务打款系统bug修复
zhengyongxing cddf09db60 财务打款系统bug修复
zhengyongxing eda3c9bbe4 财务打款系统bug修复
zhengyongxing 110e5001ee 商务汇总修改
zhengyongxing 859fce06c4 商务奖金功能修改
zhengyongxing 7178181ebb 财务打款系统bug修复
chenzhi 2ad1ff5434 优化加入组别
chenzhi 7355546a58 优化新增用户组
zhengyongxing 01a0d7c717 财务打款系统bug修复
zhengyongxing f474095a24 Merge branches 'feature/add_item' and 'release' of 8.136.139.249:wmtx/platform into feature/add_item_new 
 Conflicts:
	Application/Admin/Controller/GameController.class.php
zhengyongxing 619d9d547e 商务奖金功能上传
chenzhi 8f7405bb17 优化权限
ELF c7341d149d 优化
ELF c7b90f54a6 优化
ELF d7d78e748d 修改跨区bug
chenzhi 5ea5bb2eaa 优化子站登陆
chenzhi 2a168fb907 优化子站登陆所需函数
廖金灵 8323361a9e Merge pull request '强制落地页转换' () from hotfix/force_landing_page into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/243
ELF 15e1fff0ac 优化
ELF 5d92af7dcc 优化
廖金灵 69301ee537 Merge pull request '优化子站上游比例按实际结算' () from feature/finance_payment_20210115 into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/240
chenzhi 6c3aefcf55 优化子站上游比例按实际结算
tping 9d478c0bc7 1
廖金灵 64a4923564 Merge pull request '财务打款系统bug修复' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/237
zhengyongxing 2892562b2c 财务打款系统bug修复
chenzhi 96f832322c Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
chenzhi 3b447b70d0 优化公会统计
廖金灵 d6dfae336b Merge pull request '修改九天仙尘落地页名称显示' () from hotfix/special_game_name into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/235
ELF 6bc17ad982 修改九天仙尘落地页名称显示
chenzhi 7ca675b520 优化推广员统计
chenzhi 6c46dd0ea5 优化汇总
chenzhi abb88719b5 新增表同步
ELF a2bd05ceac Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/testing_game_server
廖金灵 a4bbe4fe39 Merge pull request '修复' () from feature/LY0309 into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/232
ELF 7bb9aa833c 优化
liyang a960ed7c0c 修复
ELF e5d4c2e231 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/testing_game_server
廖金灵 1b4fb17d2c Merge pull request 'feature/LY0309' () from feature/LY0309 into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/231
ELF 5bf8961f14 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/testing_game_server
ELF 8dee426c5f 优化
liyang da588a3d86 修复
廖金灵 9973e72bf3 Merge pull request 'feature/add_item' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/229
郑永星 77532bdb08 Merge pull request 'feature/add_item' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/230
zhengyongxing 97fae33c43 公会信息功能提交
zhengyongxing f69b0ddf14 公会信息功能提交
liyang 42a8fc94f7 角色查询-本推广号
chenzhi 57abd846c6 新增财务汇总重算
郑永星 841e875e40 Merge pull request '结算单编辑功能负数可编辑' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/228
zhengyongxing d7f13aad93 结算单编辑功能负数可编辑
廖金灵 7f3f3997fd Merge pull request 'feature/LY0309' () from feature/LY0309 into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/224
郑永星 d24d98d11d Merge pull request '市场业绩bug修复' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/227
zhengyongxing 22b17c5010 市场业绩系统bug修复
zhengyongxing c06b954bf7 市场业绩bug修复
郑永星 5fea16b821 Merge pull request '市场业绩bug修正' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/226
zhengyongxing 7c60d8321b 市场业绩bug修正
liyang 5cd8ca2857 角色查询、额外额外、测试资源权限修改
liyang a457750390 角色查询、额外额度、测试资源权限修改
廖金灵 2690db95ab Merge pull request 'feature/finance_payment_20210115' () from feature/finance_payment_20210115 into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/223
郑永星 6051f9ee2a Merge pull request '子系统上游修正' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/222
chenzhi b19d73388b 子站游戏订单bug
zhengyongxing 68c873983b 子系统上游修正
chenzhi ce90ddf3ad 优化推广员统计
廖金灵 8e571e0808 Merge pull request 'feature/finance_payment_20210115' () from feature/finance_payment_20210115 into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/219
chenzhi c91206c176 优化推广员统计
chenzhi 7c460cdb47 优化支付导出
陈志 b4277c2276 Merge pull request '优化订单换绑到江息' () from feature/finance_payment_20210115 into release 
优化订单换绑到江息
chenzhi c2303a0676 优化订单换绑到江息
郑永星 c754037b79 Merge pull request '财务子系统bug修改' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/216
zhengyongxing 2f9a822583 财务子系统bug修改
chenzhi 4f14228bab 优化子站列表
chenzhi a03993f251 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
liyang 8617ad3e91 Merge branch 'release' of http://8.136.139.249:3000/wmtx/platform into feature/LY0309
chenzhi 1b7dae2603 优化结算同步
chenzhi c21b9f619e 新增子站结算
zhengyongxing 0332b591e8 3.22功能提交
chenzhi 8d871290f2 优化默认公司
zhengyongxing eb8c9cebc1 3.22好功能提交
chenzhi 50363297e8 优化订单数据换绑
chenzhi f670c7196a 优化提示
chenzhi 6790ab5fd3 新增订单重算及固化
chenzhi 1de381bccd 优化是否结算
chenzhi bb10181cc5 新增子站游戏订单及导出
chenzhi 8b98460242 新增备注
chenzhi 17cee767b7 子站同步脚本
liyang f8b93616ce 菜单封装中
chenzhi 59d1e31119 优化退款可以负数
chenzhi 7ed2855dc5 优化重算
chenzhi e7a51c41da 优化前端入口文件
chenzhi 5f3c726a05 优化游戏统计合计
chenzhi 243dce02ca 优化聚合万盟数据
chenzhi aa99f1f668 新增审核撤回
chenzhi 88d02f7be1 优化导出提醒-zyx
廖金灵 a429003fa9 Merge pull request '财务子系统bug修复' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/198
zhengyongxing 3900a4081a 财务子系统bug修复
zhengyongxing ae3ad391fd 新功能开发
廖金灵 96c6a47dd5 Merge pull request '热更修复' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/197
zhengyongxing a84a69fd56 热更修复
郑永星 3eb6fbad4d Merge pull request 'feature/add_item' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/196
ELF 1ab1db12ab 修复苹果落地页无法滚动bug
廖金灵 e9507ddb95 Merge pull request '热更修复汇总上游时间错误' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/194
zhengyongxing 55c75e159c 热更修复
廖金灵 df747704ba Merge pull request '2.28号功能提交' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/193
zhengyongxing 55ffc36a10 2.28号功能提交
廖金灵 bd20d4a770 Merge pull request '2.28号功能提交' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/192
zhengyongxing 4aa569d092 2.28号功能提交
陈志 f328397807 Merge pull request 'feature/finance_payment_20210115' () from feature/finance_payment_20210115 into release 
优化连接
chenzhi 75850db849 优化测试
chenzhi 0a0ee66012 优化连接
chenzhi cc59050261 优化权限添加
陈志 a26b10ab2c Merge pull request 'feature/finance_payment_20210115' () from feature/finance_payment_20210115 into release 
优化上游
chenzhi a33ea0d575 优化上游
chenzhi e8dea24f46 新增周结
陈志 a85ae5125c Merge pull request '优化子站平台币充值区分万盟' () from feature/finance_payment_20210115 into release 
优化子站平台币充值区分万盟
chenzhi 55572ce862 优化子站平台币充值区分万盟
郑永星 0c465ef26d Merge pull request '2.28号功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/186
zhengyongxing 886bbfcfc2 2.28号功能提交
郑永星 1b86292c4e Merge pull request '2.28号功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/185
zhengyongxing 73beadd929 2.28号功能提交
郑永星 d73e2bae02 Merge pull request '2.28号功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/184
zhengyongxing bc3f4f02d3 2.28号功能提交
郑永星 727873e25c Merge pull request 'feature/add_item' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/183
zhengyongxing 1ec35eeb32 2.28号功能提交
chenzhi 7756efe859 优化结算单显示
zhengyongxing 2af6231106 2.28号功能提交
zhengyongxing 5556bbf171 2.28号功能提交
zhengyongxing 9837ba3682 2.28号功能提交
zhengyongxing 0be51f4d62 2.28号功能提交
郑永星 0f39caaf60 Merge pull request 'feature/add_item' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/177
zhengyongxing c6587b61a5 2.28号功能提交
zhengyongxing 8e28b1c4ad 2.28号功能提交
郑永星 dfdcedea38 Merge pull request '2.28号功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/176
chenzhi 12f84844c4 新增权限审核
zhengyongxing 016c2e11bd 2.28号功能提交
chenzhi a889417f5a Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
chenzhi 0b4e9fa9a1 优化重算
郑永星 23147ac0cc Merge pull request '2.28号功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/173
zhengyongxing 4425750972 2.28号功能提交
chenzhi 3263c108c3 新增个人结算
chenzhi c285a88c8d 优化子站生成数据
chenzhi 7d650a9595 子站内团脚本
chenzhi a439946207 优化子站启动脚本
chenzhi 4024e45c64 优化子站上游结算
chenzhi e6e8e1d0b3 暂存
chenzhi b75bcdbb1c 新增上游导出查看
郑永星 b7a120c56a Merge pull request '2.10号功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/172
zhengyongxing c2bfcd39b6 2.10号功能提交
郑永星 f078bfd8b6 Merge pull request '2.10号功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/171
zhengyongxing 4419f1539c 2.10号功能提交
郑永星 3c760984ab Merge pull request '2.10号功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/170
zhengyongxing 9b2f7b1a61 2.10号功能提交
陈志 6d60674031 Merge pull request '优化永星bug' () from feature/finance_payment_20210115 into release 
优化永星bug
chenzhi 098ba97d3e 优化永星bug
廖金灵 36becfb8d6 Merge pull request '1' () from feature/0207zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/166
廖金灵 81ac1baaf1 Merge pull request '额外额度计算修改' () from feature/TestingResource-0205 into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/167
liyang 65ca417a2e 推广后台资源申请页面
liyang e008e14046 额外额度计算修改
tping fb3bcdd107 1
廖金灵 e84f8c174a Merge pull request '优化' () from feature/testing_quota_up into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/165
ELF 8a815af691 优化
ly 4a69622b01 额外额度备注信息显示
chenzhi c936ee528c 优化取消时间导出错误
liyang 769a6974ab 额外额度、申请批次修改
郑永星 84d6d1c145 Merge pull request '2.7号功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/161
zhengyongxing 6dce14520e 2.7号功能提交
郑永星 2a3446b56c Merge pull request '2.7号功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/159
zhengyongxing 92d6f504e8 2.7号功能提交
郑永星 4e6e402f71 Merge pull request '2.7号功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/158
zhengyongxing 347facea89 2.7号功能提交
郑永星 bf2851b11d Merge pull request '2.7号功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/157
zhengyongxing fec3c76ac1 2.7号功能提交
郑永星 b060f3302d Merge pull request '2.7号功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/156
zhengyongxing b2231ff63b 2.7号功能提交
chenzhi 3997bc4b17 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
chenzhi 2f90e19f1f 移除个人导出打款状态
chenzhi b592554501 Merge branch 'feature/testing_daily_count' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
陈志 9b3b982df7 Merge pull request '优化所属会长判断' () from feature/testing_daily_count into release 
优化所属会长判断
chenzhi d7a787c0fc 优化所属会长判断
郑永星 12eb8aa9f0 Merge pull request '2.7号功能提交' () from feature/add_item into release 
2.7号功能提交
zhengyongxing 53ba2c7698 2.7号功能提交
陈志 a28c71ecb8 Merge pull request 'feature/testing_daily_count' () from feature/testing_daily_count into release 
优化测试统计导出
chenzhi 290b48dc3b 优化测试统计导出
chenzhi 4e5f6a664d 更新bug
陈志 a9e53ea354 Merge pull request '新增线上线下结算统计' () from feature/finance_payment_20210115 into release 
新增线上线下结算统计
张谷成 76f6c77160 Merge pull request '1' () from hotfix/0203 into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/148
tping f3efd97a19 1
tping 792508bd64 1
tping e5b6af3771 1
chenzhi e2882cc5aa 新增线上线下结算统计
tping d14cb334af Merge branch 'release' into feature/0207zgc
tping fbf0b27ca3 推广后台充值导出
chenzhi 9cfe8abe68 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
chenzhi 4a80ee2f87 优化公会统计说明
廖金灵 9fdfeb7586 Merge pull request '测试资源修改' () from feature/testing_resource_permission into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/144
chenzhi 35c25119e4 优化管理后台线下打款合计字段
chenzhi fa514335cd 统一打款系统统计
chenzhi 0c54e6ecb7 新增汇总单号查找
chenzhi 926b8975f1 修改名词
chenzhi a10174b3e6 优化打款系统登陆
chenzhi 8b4814cbf5 优化结算审核
ELF 2ecaa742d5 优化
ELF a355c2b579 优化
廖金灵 b6412dd9c7 Merge pull request '市场业绩脚本修正' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/138
zhengyongxing 3e363d65d5 市场业绩脚本修正
廖金灵 49bc231e92 Merge pull request '工会统计bug修改' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/135
zhengyongxing 735823d792 工会统计bug修改
elf@home 23643d2e0b 修改
廖金灵 ea21c1ee49 Merge pull request '修改i哎' () from feature/add_promote_level_id into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/133
ELF 874ba3a705 修改i哎
廖金灵 a217127548 Merge pull request '优化' () from feature/add_promote_level_id into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/132
ELF 91996da3a2 优化
郑永星 42550a32fb Merge pull request '1.28功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/131
zhengyongxing 199b5e0f51 1.28功能提交
郑永星 5c5fc23210 Merge pull request '1.28功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/130
zhengyongxing cd1f84fb37 1.28功能提交
廖金灵 9af9edef0a Merge pull request '优化' () from feature/add_promote_level_id into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/129
ELF a3d3b5722c 优化
郑永星 a5ed9cf3cf Merge pull request '1.28功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/128
zhengyongxing a1c809d7eb 1.28功能提交
郑永星 3d09dcf4b5 Merge pull request '1.28功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/127
zhengyongxing 338c0369d1 1.28功能提交
郑永星 8d9ca939d6 Merge pull request '1.28功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/126
zhengyongxing 25ec474c1c 1.28功能提交
郑永星 e9be27136f Merge pull request '1.28功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/121
zhengyongxing 77f7eda10f 1.28功能提交
廖金灵 dcbc152712 Merge pull request '优化' () from feature/add_promote_level_id into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/125
ELF 4f3c21263d 优化
陈志 dcb2e68346 Merge pull request '优化提示' () from feature/finance_payment_20210115 into release 
优化提示
chenzhi 3947f12f54 优化提示
陈志 b9f83d7f15 Merge pull request '优化打款信息' () from feature/finance_payment_20210115 into release 
优化打款信息
chenzhi 9a0ba40d6d 优化打款信息
tping 6ed8fee113 1
tping de31285f85 Merge branch 'release' into feature/0128
tping a865b9d669 文字修改
zhengyongxing 88fc0e2926 1.28功能提交
郑永星 e1a05cb9fe Merge pull request '1.28功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/120
zhengyongxing 45ed2e7f16 1.28功能提交
郑永星 272eca3f9a Merge pull request '1.28功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/119
zhengyongxing 7a2e4d9033 1.28功能提交
郑永星 e4fb38e5f7 Merge pull request '1.28功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/118
zhengyongxing 3c1a7a2e61 1.28功能提交
郑永星 154c0989c8 Merge pull request '1.28功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/117
zhengyongxing 7e4f8ca78d 1.28功能提交
郑永星 5a232e6bb6 Merge pull request '1.28功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/116
zhengyongxing 3c566fb2ae 1.28功能提交
tping c59b8d1419 导出所有
tping cfd4368fe5 1
tping 5c22a252a3 Merge branch 'release' into feature/0128
tping a5b977aa00 导出所有
廖金灵 7194d5a945 Merge pull request '优化' () from feature/add_promote_level_id into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/112
ELF 0aa3c514d7 优化
陈志 14ba644fda Merge pull request '优化提醒名词' () from feature/testing_daily_count into release 
Re优化提醒名词
chenzhi 9d9ef7a79b 优化提醒名词
陈志 98f9c61104 Merge pull request '优化排序' () from feature/testing_daily_count into release 
优化排序
chenzhi 746388dd00 优化排序
陈志 b690ef68a2 Merge pull request 'feature/testing_daily_count' () from feature/testing_daily_count into release 
优化菜单适配
chenzhi 3f88e7dc6f 优化菜单适配
chenzhi b19853edd3 优化菜单
zhengyongxing 8a49578cc4 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/add_item
zhengyongxing 104051d90f 1.28功能提交
陈志 0b55550a62 Merge pull request 'feature/testing_daily_count' () from feature/testing_daily_count into release 
优化首页提醒
chenzhi 13d0c6fa59 优化首页提醒
zhengyongxing c7730d5d06 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/add_item
ELF 9e68e40200 解决冲突
chenzhi 2658c50c3a 新增测试资源统计
ELF 531b94bae8 版本
郑永星 f4bb1cc5e2 Merge pull request '1.28功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/105
zhengyongxing f710113820 1.28功能提交
郑永星 fec6edf48c Merge pull request '1.28功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/104
zhengyongxing 14be887ebb 1.28功能提交
郑永星 747082fc0d 1.28功能提交 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/103
zhengyongxing ee463829d2 1.28功能提交
chenzhi 2e2ff8e1d7 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
chenzhi 027c803343 优化打款备注
郑永星 31d831e39a Merge pull request '1.28功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/101
zhengyongxing 0080dc75d7 1.28功能提交
chenzhi a845ff4d84 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
elf@home 34e25f293a 推广员添加每级id
郑永星 6c1c82b649 Merge pull request '1.28功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/100
zhengyongxing 58e8efbd7f 1.28功能提交
zhengyongxing deff984922 1.28功能提交
廖金灵 e31fec8a5c Merge pull request '修改' () from feature/jpck into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/98
ELF d08df7feba 修改
陈志 3df6e7246a Merge pull request 'feature/finance_payment_20210115' () from feature/finance_payment_20210115 into release 
新增线上转线下打款
chenzhi 684ea81b6a 新增线上转线下打款
廖金灵 293f2941be Merge pull request '剑破长空测试资源接口' () from feature/jpck into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/96
ELF 07c95d2ea7 剑破长空测试资源
chenzhi 7617ee8a4c 优化支付导出
chenzhi 28eedef4ed 优化支付宝信息更新
chenzhi 1427e7e744 新增更新支付信息功能ok
郑永星 af3a48f0d8 Merge pull request '奖惩限制逻辑修改' () from hotfix/reward_limit into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/94
zhengyongxing 508f4abef1 奖惩限制逻辑修改
zhengyongxing 963e806218 奖惩限制逻辑修改
zhengyongxing 14a0e564e1 Merge branch 'release' of 8.136.139.249:wmtx/platform into hotfix/rewardlimit
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 公会信息登记信息补充