Commit Graph

3552 Commits (2c5889cd50a43789458f22dbb41d0fe1bdf8ce04)

Author SHA1 Message Date
chenzhi f0e43df7c2 新增重算
chenzhi fb75494c64 新增系统执行命令方法
ELF 0923006a20 修改
廖金灵 35d34d1864 Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
bug修复
ELF c7390f4c2e bug修复
廖金灵 79af51d27b Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
测试资源发放
chenzhi f5ad1a6d0c Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
chenzhi 9f06436207 优化转换注释
chenzhi 04ac1da1d7 优化公司控制会长游戏规则
ELF 550da5cb37 测试
chenzhi e8eb963fc1 修正公司取消游戏推广员无效
elf@home f8f9046a87 提交
chenzhi 3efc4daee6 优化跟随
chenzhi c137a10c8f 优化游戏数据跟随
chenzhi 03341a7d9f 优化游戏资质展示
chenzhi 6560047a11 yh
chenzhi e94c452f85 取消结算单的管理员审核
zhengyongxing 250d2ac2c0 市场业绩毛利修改
ELF 06c4d5f1f1 优化测试资源
zhengyongxing b5e49e850d 上下游聚合打款信息修改
chenzhi fbf6948367 优化推广员整合
chenzhi fc05c274c4 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
ELF 66bffbff99 吸怪
ELF fa90dc0bc8 修改
chenzhi 2b2acf833c 优化重复添加
chenzhi 7c2ada7e17 优化个人导出
chenzhi f91db42a57 优化下游导出2
chenzhi 901198f546 优化下游个人信息
chenzhi b74b5ecfad 优化下游结算与导出
chenzhi 84a665a2ab Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
chenzhi 963802dc1c 优化下游个人结算
chenzhi c110284ad9 优化个人结算多会长
ELF d30ef409fc 优化
ELF c9cd377d4f 修改
ELF fa9d330603 修改
廖金灵 db4fc9699c Merge branch 'feature/finance_statement_three' of wmtx/platform into master
优化结算
chenzhi 7eee79a867 优化导出
ELF 9c59ba06e2 修改
zhengyongxing 62f4ce3362 上下游聚合打款信息修改
chenzhi d63edee6b3 优化结算单界面信息
chenzhi 0a136fbbde 优化结算页面时间显示
chenzhi 0a049e0391 优化下游公司导出
chenzhi 51778a2a73 优化下游公司导出及汇总
ELF 3383b3d2d9 修改
chenzhi c1b5b2f716 优化上游导出公式
chenzhi d7a9663d46 优化上游不结算
chenzhi 180e21be86 优化结算上游结算为一单
zhengyongxing 8cc9bdb0c6 市场结算管理市场业绩公式修正
chenzhi b3813dad4a 优化公司单子为一单
zhengyongxing d5e7546c51 市场结算管理市场业绩公式修正
chenzhi ec7b333fa4 优化下游个人打款设置
chenzhi aa6faf7280 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/change_dabase_bank
chenzhi cd5c6e7202 删除数据库操作功能
chenzhi 62f91bb0df 优化
chenzhi 027b1f2c08 合并ma
chenzhi 98f2711f86 合并mas
chenzhi ea7bafec91 优化下游重算
chenzhi 7beaff1825 优化下游个人汇总查看
chenzhi 95b464f636 取消公司读取会长阿里信息
chenzhi 9b78b8b461 优化下游个人结算
chenzhi 141951467c 优化个人重算用户bug
zhengyongxing ccca696de2 市场结算管理bug修正
zhengyongxing a140a4c9d5 市场结算管理bug修正
ELF 49751b8760 测试资源修改
廖金灵 a2154936f7 Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化重算
chenzhi 88a129f06c 优化重算
chenzhi 5db1f7ce24 优化比例显示
zhengyongxing bd9af09830 市场结算管理bug修正
chenzhi 4143a67238 优化下游个人导出
chenzhi 9ee69f9bd4 优化下游结算单导出
chenzhi 82787ca561 优化上游结算单导出模板样式
chenzhi 07fd53a6aa 优化上游导出文件格式及时间问题
chenzhi 7ba9c25610 优化上游导出%
zhengyongxing c72d60b37d Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
廖金灵 c53abd3114 Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化添加关系的开票内容
chenzhi 372958f45d 优化添加关系的开票内容
zyx 223c69797c 平台币导出bug修正
廖金灵 6c8699dc1e Merge branch 'hotfix/market_percentage' of wmtx/platform into master
平台币导出bug修正
zyx 8c0646d2a0 平台币导出bug修正
廖金灵 0665e8265a Merge branch 'hotfix/market_percentage' of wmtx/platform into master
市场结算管理bug修正
zyx 5dcc25f97e 市场结算管理bug修正
chenzhi 1ac4c280ad 优化其他导出
chenzhi 54239b1f54 优化导出
chenzhi b2239380bf 优化负数结算规则
chenzhi 978a42b4df 优化结算流水判定依旧平台流水
chenzhi 7335f5da15 上下游非0都要结算
chenzhi ecf92c03a7 合并
chenzhi 9b61a39620 优化游戏统计导出时间问题
chenzhi ba20c3683a 优化游戏统计时间
陈志 97f79a9c0f Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into release
chenzhi 4c1a03b7c7 优化结算流水及汇总金额300判定
廖金灵 194523f00f Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化上游cp结算比例问题
chenzhi ca7f92573b 优化上游cp结算比例问题
廖金灵 a45b12ed3f Merge branch 'hotfix/agg_data' of wmtx/platform into master
修改bug
ELF 672b276228 修改bug
廖金灵 6145745a01 Merge branch 'hotfix/agg_data' of wmtx/platform into master
修改游戏统计
ELF b71c81d764 修改bug
廖金灵 49365c790d Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化上游比例获取
chenzhi 9d9eae85ec 优化上游比例获取
zhengyongxing 22961561d4 充值订单充值状态增加
chenzhi 47e57f48e6 优化审批文字错误
廖金灵 7d676b406f Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化下游查看
chenzhi c57c40535b 优化下游查看
廖金灵 5855973c67 Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化下游结算为支付时间
chenzhi 651aa6cc8b 优化参数不足
chenzhi 071c8c78f4 优化下游结算为新增时间
廖金灵 a36123059c Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化聚合渠道统计
chenzhi 884f919387 优化聚合渠道统计
廖金灵 a05770557b Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化汇总时间显示
chenzhi 0fd5bc7fe8 优化汇总时间显示
chenzhi b9567f6faf 优化时间戳模式
chenzhi 724fe9e60f 优化导出市场专员
廖金灵 54f933aba1 Merge branch 'hotfix/agg_data' of wmtx/platform into master
修改bug
ELF 95672ffc90 修改bug
廖金灵 637f22c22b Merge branch 'hotfix/agg_data' of wmtx/platform into master
修改bug
ELF 8e40b43696 修改bug
ELF 83a1d34b2c 修改bug
廖金灵 3d36fbb00d Merge branch 'hotfix/agg_data' of wmtx/platform into master
修改bug
ELF 7445125745 修改bug
廖金灵 edae05c50e Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化结算
chenzhi f3b145f930 优化未结算查询
chenzhi f7581f3504 优化结算小于0依旧结算
ELF 6ac8a0a9b3 修改bug
ELF 0ee5ea3c02 修改bug
chenzhi a90149b31b 隐藏会长结算方式
chenzhi 12f232219c 优化下游个人查看
chenzhi 71d0d2c9d1 优化个人显示支付方式
ELF 7471dcf338 取消调试代码
ELF e34d28e2c8 修改
chenzhi 52345e4eb1 优化导出新增支付宝信息
chenzhi 3fc9b578a9 优化个人重算
chenzhi 007ca52afa 优化个人比例获取方式
chenzhi 9b32f0cd0e 优化获取cp比例
廖金灵 406d1c47d4 Merge branch 'hotfix/market_percentage' of wmtx/platform into master
平台币导出bug修正
zyx 9df721d1f5 平台币导出bug修正
廖金灵 8c942dbcbc Merge branch 'hotfix/market_percentage' of wmtx/platform into master
平台币增加商户
zyx 3c8f637240 平台币导出增加商户
zyx bbb7f3301c 平台币导出增加商户
zyx 896cdd92b9 平台币增加商户
廖金灵 20a2184521 Merge branch 'hotfix/platform_statistic_search' of wmtx/platform into master
统计搜索优化
yulingwei 8d36e35271 upt
廖金灵 1440856626 Merge branch 'hotfix/add_prompte_relation' of wmtx/platform into master
优化新增会长关系不跟随
chenzhi 5f1afdef9f 优化新增会长关系不跟随
廖金灵 0e878884bb Merge branch 'hotfix/market_percentage' of wmtx/platform into master
市场业绩bug修改,权限添加
zhengyongxing 1bea859fd4 市场业绩bug修改,权限添加
yulingwei 9cdab21db9 repair search
廖金灵 79b0f3224d Merge branch 'hotfix/session_and_bug' of wmtx/platform into release
修改权限控制
ELF cbd3bc7362 修改
廖金灵 32bdbbfc39 Merge branch 'hotfix/session_and_bug' of wmtx/platform into release
修改session过期时间
ELF 81a706e809 修改session过期时间
陈志 890499ce59 Merge branch 'fix/change_statement_time' of wmtx/platform into release
chenzhi 52419ae22a 优化上游不结算金额
chenzhi 4a44604047 优化渠道汇总
chenzhi b73e3fea84 优化财务汇总统计
chenzhi 0c11ddb004 优化聚合数据
chenzhi 98c8c7ee1e 优化测试服订单
郑永星 c55b798bb4 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
zhengyongxing 1f6c96e3a9 bug修改
zhengyongxing 05d3ba9c23 财务汇总统计bug修改
zhengyongxing e67538fcef 财务汇总统计bug修改汇总统计修改
zhengyongxing c6570fee01 财务汇总统计bug修改汇总统计修改
zhengyongxing 38da7f005d 汇总统计修改
chenzhi 13efc01d3d 优化财务汇总
chenzhi f0d20598de 新增商户权限
chenzhi ef4702fb46 暂存
郑永星 fe4a029ce4 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
zhengyongxing 1372b5b15d Merge remote-tracking branch 'origin/hotfix/market_percentage' into hotfix/market_percentage
zhengyongxing 7aa031bbb4 市场结算管理优化
chenzhi 3b3ed208e2 财务汇总新增测试订单收入
chenzhi 837c09716d 财务汇总-支付时间
廖金灵 37a84b8ce7 Merge branch 'feature/company_game_rotio_perm' of wmtx/platform into release
修改推广游戏分成市场专员权限控制
zhengyongxing f9503182da 市场结算管理优化
廖金灵 613b50eb63 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
支付渠道跳转增加
zyx 2a236849b8 充值信息查看权限默认开启
zhengyongxing f18db12d69 支付渠道跳转增加
廖金灵 c8af2d79ff Merge branch 'feature/deposit' of wmtx/platform into release
修改时间问题
廖金灵 a2474aaa0b Merge branch 'feature/reward' of wmtx/platform into release
修改时间
yulingwei b1a91339cb Merge branch 'feature/deposit' of 47.111.118.107:wmtx/platform into feature/deposit
yulingwei 1634f14fb2 upt
yulingwei a01beb9bc6 upt
郑永星 f01030ffaa Merge branch 'hotfix/market_percentage' of wmtx/platform into release
zhengyongxing d9d66dc5bf 支付渠道跳转增加
陈志 575c074c39 Merge branch 'fix/change_statement_time' of wmtx/platform into release
chenzhi b63369cdba 优化结算方式查询
chenzhi c6b3d1948e 优化打款剔除后显示
廖金灵 697dad95c8 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
支付渠道跳转增加
zhengyongxing 4c582e51c7 支付渠道跳转增加
廖金灵 d6790fdf6c Merge branch 'feature/plateform_statistics' of wmtx/platform into release
修改导出问题
yulingwei 08400bd67a upt
廖金灵 86b8682d02 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
支付渠道跳转增加
zhengyongxing 0c4f1f05bd 支付渠道跳转增加
廖金灵 fc7284de94 Merge branch 'feature/reward' of wmtx/platform into release
奖罚样式问题
廖金灵 d73ab9c4cd Merge branch 'feature/payment_merchant' of wmtx/platform into release
完善支付商户操作日志
陈志 f63985ece1 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
市场结算管理bug修改
ELF a4d4a51a2c 完善支付商户操作日志
chenzhi 3318298d2e 优化上下游导出时间
zhengyongxing 9a722d5b45 市场结算管理bug修改
yulingwei 9e53db53cd upt
yulingwei de0fc5e074 upt
chenzhi 205c6a83f8 优化上游结算
chenzhi 6f75b0e6d8 优化结算单无地址
chenzhi 493197fed2 优化重新结算
chenzhi 91510679b0 Merge branch 'fix/change_compnay_info0729' of 47.111.118.107:wmtx/platform into fix/change_statement_time
chenzhi aabc0703df 优化结算时间选择
chenzhi 8b8b0721b3 优化结算时间
chenzhi 853c938edb 优化下游个人结算时间
chenzhi 92ccc96dcd 优化下游公司结算时间审核
chenzhi a14f0abb88 上游新增结算时间判断
廖金灵 57ea4efb72 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
充值订单bug修改
zhengyongxing 8c237e19fe 充值订单bug修改
廖金灵 79f038d62a Merge branch 'hotfix/market_percentage' of wmtx/platform into release
付商户bug修改
zhengyongxing 24bcd381a0 支付商户bug修改
廖金灵 782f2ae51b Merge branch 'hotfix/market_percentage' of wmtx/platform into release
支付商户bug修改
廖金灵 3c4cf05a72 Merge branch 'feature/reward' of wmtx/platform into release
列表样式
zhengyongxing eb66cfd5d4 支付商户bug修改
yulingwei d46fa808c0 upt
陈志 67dc1b58e6 Merge branch 'fix/change_statement_time' of wmtx/platform into release
chenzhi 0f284cf9b3 优化游戏绑定,已经绑定不出现
廖金灵 4b6218f1aa Merge branch 'feature/reward' of wmtx/platform into release
修改选择样式
廖金灵 bd00e90c26 Merge branch 'feature/payment_merchant' of wmtx/platform into release
修改文字bug
ELF bc193e648e 修改
yulingwei f598b19957 Merge branch 'feature/reward' of 47.111.118.107:wmtx/platform into feature/reward
yulingwei b995ba34d9 upt
zhengyongxing 19f59d6482 菜单栏修改
zhengyongxing eebb38dc8c 商户列表字段名称修改
zhengyongxing 9d28947f9b 商户bug修改
zhengyongxing a960e0a7e4 商户bug修改
zhengyongxing 624a2b7cde 商户bug修改
zhengyongxing 9a202a393e 商户bug修改
zhengyongxing ee5fc4c7c8 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Application/Admin/View/Spend/lists.html
zhengyongxing 9670bf86b6 商户bug修改
廖金灵 6faa6e0a33 Merge branch 'feature/finance_statement723' of wmtx/platform into release
优化订单列表长cp订单显示
廖金灵 7340d5b4fd Merge branch 'hotfix/market_percentage' of wmtx/platform into release
手机号码重复验证
chenzhi 2a99226dd7 优化订单列表长cp订单显示
zhengyongxing 45d124b4cd 手机号码重复验证
廖金灵 47c565e31c Merge branch 'hotfix/market_percentage' of wmtx/platform into release
下游公司字段与上游公司字段一致
zhengyongxing 57903e8a13 下游公司字段与上游公司字段一致
ELF edb090feca 解决冲突
ELF 004b540a63 解决冲突
ELF 0803b686c3 解决冲突
廖金灵 9e3de695ca Merge branch 'feature/plateform_statistics' of wmtx/platform into release
市场部统计修改
廖金灵 e4ab39bf64 Merge branch 'feature/ip_search' of wmtx/platform into release
IP查询
zhengyongxing ea2683716f 下游公司字段与上游公司字段一致
廖金灵 54ad7191b1 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
聚合公司及增加手机登录功能
廖金灵 2ea819c585 Merge branch 'feature/finance_statement723' of wmtx/platform into release
新增防止并发请求数据
廖金灵 949570abf4 Merge branch 'feature/game_agg' of wmtx/platform into release
游戏统计显示聚合数据
ELF ff47282287 修改
chenzhi 5ef1aa6e22 新增防止并发请求数据
ELF e0f71b67c5 处理
zhengyongxing 4f681f7d72 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Data/update.sql
zhengyongxing 09629a12a8 下游公司字段与上游公司字段一致
陈志 d5c54234b3 Merge branch 'feature/finance_statement723' of wmtx/platform into release
chenzhi e3022cb6c2 关闭测试验证码
ELF 6f8b93a26b 修改
zhengyongxing 11ff884e6a Merge branch 'feature/cp_juhe_company' into hotfix/market_percentage
# Conflicts:
#	Application/Admin/Common/extend.php
#	Application/Admin/Controller/AggregateFinanceSetController.class.php
#	Application/Admin/Controller/CpJuheCompanyController.class.php
#	Application/Admin/View/CpJuheCompany/detail.html
#	Application/Admin/View/CpJuheCompany/export.html
#	Data/update.sql
zhengyongxing 91178308f9 下游公司字段与上游公司字段一致
陈志 e01c7e4e01 Merge branch 'feature/finance_statement723' of wmtx/platform into release
chenzhi 69615c1459 优化脚本执行
chenzhi 0e8730b810 优化重算需重新确认
ELF 56282658fc 解决冲突
ELF 0206a422f9 解决冲突
chenzhi fb9deff8b7 优化新增生效的默认时间
chenzhi 0f023bed36 优化结算提示
ELF fbe8d7a351 修改bug
chenzhi e2bd47ac2d 优化按钮太挤
chenzhi fe1853065a 优化结算原包名显示
chenzhi b9604c162a 优化操作时间判断
chenzhi 8de452c8f7 优化名称显示
chenzhi f4be3972b2 优化结算单确认
chenzhi b7409ab069 优化导出
chenzhi eb311348a8 优化检索
chenzhi 47b54d336c 优化汇总撤回
chenzhi 4d65542338 优化结算包名文字
chenzhi 2a303cf0f5 优化审核流程
chenzhi 0aac0cfad7 新增结算类型
chenzhi 31b1c771a1 新增全量查看
chenzhi a69b21dd14 汇总单新增周月结审核
chenzhi 3ef8061e3e 优化个人0值重算
chenzhi 6b9358c651 优化结算
chenzhi 3cbc769bce 优化个人结算
chenzhi f70d8cb8a7 优化个人结算
chenzhi 7f01c3ff39 优化上游结算方式
chenzhi f91b2a5dce 优化下游结算
chenzhi d946a4c91c 优化下游公司结算
chenzhi 8e77f3ed4d 优化上游结算
chenzhi 16a3bea172 优化上游新增服务器费用结算包名
chenzhi 51c4b07eea 优化上游结算包名
chenzhi 2de8e4a313 开启测试验证码
chenzhi b0034d5f19 优化推广公司游戏申请不审核
chenzhi a948986b41 优化上游导出
chenzhi 62f2bc350d 优化时间控件
chenzhi 5c857840a2 分成比例新增生效检索
chenzhi 94a3057013 新增游戏分成比例导出
chenzhi ac65098827 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement723
廖金灵 5f0917220c Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
推广分成特殊申请
chenzhi 8e4541cb01 推广分成特殊申请
廖金灵 762c93d89e Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
优化电话不限制
chenzhi b1790a8897 优化手机不限制
廖金灵 c67cbc61c2 Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
优化电话不限制
chenzhi 0430293bb7 优化电话不限制
chenzhi 1e3b1dad66 优化排序
廖金灵 4869d650d9 Merge branch 'feature/cp_juhe_company' of wmtx/platform into release
时间格式修正,导出格式修改
zhengyongxing 815e2e3b88 时间格式修正,导出格式修改
chenzhi 6024ae342c 优化顺序及导出
zhengyongxing 08e221a53c 商户专员隐藏
chenzhi 8ded1f3169 优化游戏模板显示
chenzhi 4460f8e7cf 新增结算包名
廖金灵 a958f8c043 Merge branch 'feature/cp_juhe_company' of wmtx/platform into release
聚合公司详情详细网址条件修改
zhengyongxing 52fe6d04f8 聚合公司详情详细网址修改
廖金灵 a70a494102 Merge branch 'feature/cp_juhe_company' of wmtx/platform into release
聚合公司详情详细网址修改
zhengyongxing 4325ed23ee 聚合公司详情详细网址修改
chenzhi 3ff79ce6c1 优化公会检索
chenzhi 832f531d20 优化审核通过
廖金灵 b8532da607 Merge branch 'feature/cp_juhe_company' of wmtx/platform into release
聚合公司详情详细地址格式修改
zhengyongxing 5bbdfe7e74 聚合公司详情详细地址修改
ELF 557f0203ac 解决冲突
廖金灵 5d809ae9b8 Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
优化合同期限查询
chenzhi eaa6762935 优化模板错误
ELF 62d7f15fdc Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_landing_assign
chenzhi 0197743266 优化合同期限查询
zhengyongxing 68f8bb1ce0 聚合公司详情详细地址修改
chenzhi 4dd8526e2b 优化日志
chenzhi 3ad0d447d4 优化显示
chenzhi 4501036ba8 优化导出错误
chenzhi 069cc1599a 优化上游检索
chenzhi 5a962e1b73 新增分成优化
zhengyongxing 26f13922a1 聚合公司时间修正
chenzhi 0237e0ff63 优化导出
chenzhi 6181059faf 优化搜索
chenzhi 945f033df5 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/platfrom_aggregate_finance
chenzhi 10e56211ce 优化导出提示
chenzhi 1ec951d344 优化空值显示
chenzhi 61e6d8131c 新增支付宝真实名称只能是中文验证
chenzhi f66bce14b2 优化下游列表显示及导出
chenzhi 5894324ca8 旧数据脚本
chenzhi 94cbae1924 优化打款提醒
chenzhi c733fc2e15 优化游戏删除
chenzhi d015bce440 优化推广下游查看
chenzhi 80e8477b51 新增检索
ELF c127ea6139 修改bug
ELF 546d83f4a3 修改bug
ELF bb8052614b 修改推广游戏分成市场专员权限控制
chenzhi a3f28b67a5 新增游戏搜索
zhengyongxing 1fff2e6c09 财务代码搬到新的分支上
zhengyongxing 341fa19b6f 聚合公司功能提交
zhengyongxing 2fe7c864df 聚合公司功能提交
zhengyongxing 420723f593 商户充值汇总更改名称
zhengyongxing 4c3112b70e 充值信息查看权限添加
zhengyongxing 837358f86b 支付商户统计字段展示修改
chenzhi d91d8346b9 优化下游导出