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

5772 Commits (f8a7d53ac8c6f80f3a8bf1301a99fdcb9d1d25ff)

Author SHA1 Message Date
廖金灵 d29ec01ab6 Merge branch 'feature/agg_game_fail' of wmtx/platform into release 
修改
ELF b9779df6b1 修改
廖金灵 429ded27b8 Merge branch 'feature/agg_game_fail' of wmtx/platform into release 
修改
ELF 0ff1089682 修改
廖金灵 c633109176 Merge branch 'feature/agg_game_fail' of wmtx/platform into release 
留存率不区分设备
ELF 619e1de3f3 留存率不区分设备
陈志 c1fbda369b Merge branch 'feature/finance_statement_three' of wmtx/platform into release 
优化财务汇总测试收入
廖金灵 7436e7c89d Merge branch 'feature/agg_game_fail' of wmtx/platform into release 
测试订单优化
ELF 3c3222ad26 测试订单优化
chenzhi eb2cd7d50f 优化财务汇总测试收入
陈志 3628dd630e Merge branch 'feature/company_export_change' of wmtx/platform into release 
上游导出修正
陈志 d130e6cf6d Merge branch 'feature/finance_statement_three' of wmtx/platform into release 
优化个人汇总导出异常
chenzhi f405faa924 优化个人汇总导出异常
陈志 053d1de648 Merge branch 'feature/finance_statement_three' of wmtx/platform into release 
优化个人结算
chenzhi 1a55fbce69 优化个人结算
廖金灵 151fa30be5 Merge branch 'feature/agg_game_fail' of wmtx/platform into release 
聚合订单查询
ELF a18e4188bd 修改bug
chenzhi 05f11648a0 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
zhengyongxing ae8cf5ad38 上游导出修正
郑永星 7f3de4d901 Merge branch 'feature/company_export_change' of wmtx/platform into release 
下游导出修正
zhengyongxing f0c425ae82 下游导出修正
郑永星 f0153776c3 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
特殊比例功能修正
郑永星 0010a39c76 Merge branch 'feature/company_export_change' of wmtx/platform into release
zhengyongxing 3c6418425a 上游导出修正
zhengyongxing 3b2ddded90 特殊比例功能修正
廖金灵 c9b1326c42 Merge branch 'feature/promote_company_merge' of wmtx/platform into release 
修改
ELF 6596e01a29 修改
zhengyongxing 65532fc0ab Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/company_export_change_other 
 Conflicts:
	Application/Admin/Controller/PromoteCompanyController.class.php
	Application/Base/Tool/AggregateClient.class.php
chenzhi 31af865a9f 优化线下打款确认
郑永星 3bc318daf3 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
特殊比例申请功能提交
zhengyongxing 418d5a6bda 特殊比例申请功能提交
ELF 6e2fda1e26 解决冲突
廖金灵 d48e90e1db Merge branch 'feature/new_game_auth' of wmtx/platform into release 
新增游戏自动授权
廖金灵 3690b7d000 Merge branch 'feature/agg_game_fail' of wmtx/platform into release 
游戏统计/聚合订单数据相同
ELF ae294252ee 修改
zhengyongxing 23555f8d4d 特殊补点功能修改
zhengyongxing 0215082018 特殊补点bug修正
zhengyongxing 3022525c85 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage 
 Conflicts:
	Application/Admin/Controller/CompanyStatementPoolController.class.php
zhengyongxing cd331f2c64 上下游聚合打款信息修改
chenzhi 9234919180 优化导出
chenzhi 6cb4ecb930 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
zhengyongxing 2c005d1996 特殊补点汇总功能修改
zhengyongxing 4ed51cb112 上下游聚合打款信息修改
chenzhi c795e5de6c 优化下游个人汇总样式
zhengyongxing f4aeae340d 特殊补点功能修正
zhengyongxing 565d3c9576 特殊补点功能修改
zhengyongxing 73dff8839e Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage 
 Conflicts:
	Application/Admin/Controller/CompanyStatementPoolController.class.php
陈志 8fbf101e88 Merge branch 'feature/finance_statement_three' of wmtx/platform into release 
优化汇总导出错误
chenzhi ce5a83e9bc 优化汇总导出错误
zhengyongxing 50495e73ca 特殊补点功能修改
zhengyongxing 6103908d83 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage 
 Conflicts:
	Application/Admin/Controller/CompanyStatementController.class.php
	Application/Admin/Controller/CompanyStatementPoolController.class.php
zhengyongxing 872de1ff73 上下游聚合打款信息修改
zhengyongxing b75e0725a1 特殊补点功能修改
zhengyongxing 9265d7c9b6 上下游聚合打款信息修改
ELF 1fbb9f097e ss
ELF 53f2649d9a ss
ELF 32bc839dcd 合并
陈志 fbdab69c71 Merge branch 'hotfix/add_company_partner' of wmtx/platform into release 
优化上游添加错误
ELF e0bbec0978 修改
chenzhi 57b692cd67 优化上游添加错误
chenzhi 180332ab87 优化下游未汇总导出
ELF ad2037408d 优化
chenzhi 4a98c587fa 新增线下打款确认
ELF 7614d5feca 修改
ELF 9d041f7c8a 修改
ELF e441f030c0 优化
ELF e9038d7471 ss
chenzhi 69cf42e895 新增线下确认打款
ELF 9b88e97672 修改
ELF 296e378501 修改
ELF e4854aca3a 修改
chenzhi e2d179acd8 新增线下打款
zhengyongxing 9000533644 下游公司功能提交
ELF 1a14ed8dc7 修改
zhengyongxing 24e33ed8ba Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage 
 Conflicts:
	Data/update.sql
chenzhi b35d0a0e95 新增删除日志
chenzhi 79468aa6f2 新增结算删除
ELF 34a22d65bf 修改
ELF 42547128d4 优化押金
chenzhi 36d72848bb 优化市场专员
chenzhi a18df8c6fb 优化下游个人多比例结算
ELF 7adabb54f9 修改
chenzhi ed66facc8f 优化结算查看
elf@home c40fbf3870 新增游戏自动授权
elf@home 50755b89c5 修改
zyx 89801c1467 特殊补点功能完善
zhengyongxing e6bc6853aa 特殊补点结算功能添加
ELF cc6c5d4e74 修改
chenzhi ff19f3259f 优化下游公司多比例结算
chenzhi 492d7a8f73 优化获取比例
chenzhi f5fb65e400 新增获取公司游戏比例
chenzhi 8e2f07db38 优化系统任务注释
chenzhi 4f70b89063 优化系统任务执行
chenzhi b88f2986bd 优化重算，兼容wind
chenzhi 7ceafb1d42 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
chenzhi 6e49bcc353 优化财务汇总
chenzhi 8b82fff791 优化任务插入
chenzhi 62b566e8b8 优化地址填写
ELF 2867a05bb3 修改
chenzhi f0e43df7c2 新增重算
chenzhi fb75494c64 新增系统执行命令方法
ELF 0923006a20 修改
ELF 3890410bec 优化
廖金灵 90bb38cd56 Merge branch 'hotfix/test_resource_new' of wmtx/platform into master 
修改BUG
ELF b1f4ec2d9a 修改
廖金灵 747dc7394c Merge branch 'hotfix/test_resource_new' of wmtx/platform into master 
修改bug
ELF 404da03cd0 修改
廖金灵 35d34d1864 Merge branch 'hotfix/test_resource_new' of wmtx/platform into master 
bug修复
ELF c7390f4c2e bug修复
廖金灵 8ae08a6784 Merge branch 'hotfix/test_resource_new' of wmtx/platform into master 
测试资源权限
ELF 2a52df9ebb 测试资源权限
廖金灵 79af51d27b Merge branch 'hotfix/test_resource_new' of wmtx/platform into master 
测试资源发放
ELF e249596014 修改
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 取消结算单的管理员审核
ELF c2da9641f0 优化
zhengyongxing 250d2ac2c0 市场业绩毛利修改
ELF 06c4d5f1f1 优化测试资源
zhengyongxing b5e49e850d 上下游聚合打款信息修改
ELF 247c4e9aae ss
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 修改
ELF 367345ea8d 修改
elf@home 461f347b1a 修改
ELF ecf460e7c9 修改
廖金灵 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 优化下游个人打款设置
ELF c0fe59864c 修改
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
廖金灵 a2ab4a6680 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
市场结算管理bug修正
zhengyongxing ccca696de2 市场结算管理bug修正
zhengyongxing a140a4c9d5 市场结算管理bug修正
ELF 49751b8760 测试资源修改
廖金灵 a2154936f7 Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master 
优化重算
chenzhi 88a129f06c 优化重算
廖金灵 730dd059d8 Merge branch 'hotfix/landing_page' of wmtx/platform into master 
落地页优化
廖金灵 8711b85d1e Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
市场结算管理bug修正
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修正
yulingwei ba91c60d5d upt
yulingwei 8d1415258f upt
chenzhi 4a900587a6 优化财务打款备注
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 充值订单充值状态增加
yulingwei 08c4d82b00 upt
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 553ee7a752 优化获取
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 修改
陈志 e8e9035c08 Merge branch 'fix/change_statement_time' of wmtx/platform into release
chenzhi 51fb6a3ebd 优化打款配置
陈志 281bcc7638 Merge branch 'fix/change_statement_time' of wmtx/platform into release
chenzhi 16f8bead31 优化打款
chenzhi 7902df54e4 优化测试站不打款
廖金灵 32bdbbfc39 Merge branch 'hotfix/session_and_bug' of wmtx/platform into release 
修改session过期时间
ELF 81a706e809 修改session过期时间
chenzhi bbd29dcebb 移除打款配置
陈志 890499ce59 Merge branch 'fix/change_statement_time' of wmtx/platform into release
chenzhi 52419ae22a 优化上游不结算金额
chenzhi 700a69b947 优化打款导出不体现公式
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 支付渠道跳转增加
廖金灵 f543804c87 Merge branch 'feature/promote_base_info' of wmtx/platform into release 
用户信息
yulingwei deaa20c5bf upt
廖金灵 fc7284de94 Merge branch 'feature/reward' of wmtx/platform into release 
奖罚样式问题
廖金灵 c114446d55 Merge branch 'feature/promote_base_info' 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 c308bbbd6c upt
yulingwei 9e53db53cd upt
yulingwei de0fc5e074 upt
chenzhi 205c6a83f8 优化上游结算
chenzhi 6f75b0e6d8 优化结算单无地址
yulingwei 19c3aeec50 Merge branch 'feature/promote_base_info' of 47.111.118.107:wmtx/platform into feature/promote_base_info
yulingwei a88b182641 upt
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