qy-platform/Application/Admin/Controller
zhengyongxing 3022525c85 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Application/Admin/Controller/CompanyStatementPoolController.class.php
..
ActionController.class.php 管理后台导出权限添加
AddonsController.class.php
AdminController.class.php 修改
AdvController.class.php
AggregateFinanceSetController.class.php 财务代码搬到新的分支上
AggregateFinanceStatementController.class.php 优化聚合渠道统计
AjaxController.class.php 特殊补点结算功能添加
AlidayuController.class.php
AlipayAuthController.class.php
AmericaIpForbitController.class.php 苹果beta包添加第三方支付名单
AppController.class.php
ApplyController.class.php 管理后台导出权限添加
ArticleController.class.php 弹窗
AttributeController.class.php
AuthManagerController.class.php 市场专员业绩管理bug修改
AutoController.class.php 管理后台>推广员>结算管理>推广提现--增加自动审核功能
AutoPackController.class.php 优化打包
BehaviorLogController.class.php 官方渠道修改江息网络
BindRechargeRecordController.class.php 官方渠道修改江息网络
BindSpendController.class.php
BoonController.class.php
BosController.class.php
BusinessAffairsController.class.php 管理后台导出权限添加
CategoryController.class.php
CertController.class.php
ChannelController.class.php
CheckController.class.php
ClearCacheController.class.php
CmdTasksController.class.php 优化系统任务注释
CommentController.class.php
CompanyGameRatioController.class.php 特殊补点结算功能添加
CompanyRelationController.class.php 优化游戏绑定,已经绑定不出现
CompanyStatementController.class.php 特殊补点功能修正
CompanyStatementLackController.class.php 上下游聚合打款信息修改
CompanyStatementOfflineController.class.php 新增线下打款确认
CompanyStatementPoolController.class.php Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
CompanyStatementSetController.class.php 优化下游个人汇总样式
ConfigController.class.php
ConsoleController.class.php 测试资源修改
ContractController.class.php
CosController.class.php
CpJuheCompanyController.class.php 下游公司字段与上游公司字段一致
DeductBindRecordController.class.php 管理后台导出权限添加
DemoController.class.php
DepositController.class.php 平台币增加商户
DevelopersController.class.php Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
ExportController.class.php 合并
FileController.class.php 推广员资质认证
FilesController.class.php
FinanceCompareController.class.php 优化订单校验
FinanceController.class.php 合并
FinancePromoteController.class.php Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
FinancialSummaryController.class.php 优化地址填写
FinancialSummarySetController.class.php 优化系统任务执行
GameApiController.class.php bug修复
GameController.class.php 解决冲突
GameRatioMouldController.class.php 新增游戏分成比例导出
GameSourceController.class.php 管理后台导出权限添加
GameTypeController.class.php 管理后台导出权限添加
GiftbagController.class.php 优化后台
GuessController.class.php
IndexChartSetController.class.php
IndexController.class.php
KefuController.class.php
Ks3Controller.class.php
KuaijieController.class.php
LaunchController.class.php 管理后台导出权限添加
LinksController.class.php
MarketController.class.php 修改
MarketPercentageController.class.php 市场业绩毛利修改
MemberController.class.php repair
MendController.class.php 优化换绑时间
MenuController.class.php
MerchandiseController.class.php 管理后台导出权限添加
MessageController.class.php
ModelController.class.php
MsgController.class.php 管理后台导出权限添加
NoticeController.class.php
OldCountController.class.php 优化跟随
OpentypeController.class.php
OperationLogController.class.php 新增操作权限
OrderController.class.php 管理后台导出权限添加
OssController.class.php
PartnerController.class.php 优化上游添加错误
PayChannelController.class.php 支付渠道跳转增加
PayChannelIntentionController.class.php 管理后台导出权限添加
PayMerchantController.class.php 支付渠道跳转增加
PaymentMerchantController.class.php 修改session过期时间
PersonalMenusController.class.php
PhoneController.class.php
PlatformController.class.php upt
PlistController.class.php
PointRecordController.class.php
PointShopController.class.php
PointShopRecordController.class.php
PointTypeController.class.php
PresidentDepositController.class.php upt
PresidentIndexChartSetController.class.php
PromoteCoinController.class.php 管理后台导出权限添加
PromoteCompanyController.class.php 优化公司控制会长游戏规则
PromoteController.class.php 优化新增会长关系不跟随
PromoteGameRatioController.class.php 修改推广员流水可选填
PromoteGiftController.class.php
PromoteLimitRuleController.class.php 商户配置
PromoteWelfareController.class.php 管理后台导出权限添加
ProvideController.class.php 管理后台导出权限添加
PublicController.class.php Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
PushController.class.php
QiniuController.class.php
QrLoginController.class.php
QueryController.class - 副本.php
QueryController.class.php 市场结算定时器优化
QuestionController.class.php
RebateController.class.php 管理后台导出权限添加
RebatelistController.class.php
RechargeSumController.class.php 将官方渠道修改为江息网络
RefundController.class.php
RepairController.class.php 推广员充值汇总优化,补单功能添加
ResourceVerifyConfigController.class.php 最低申请额度与最高申请额度不能小于0
RouteController.class.php
SdkMenuController.class.php
SelfbuiltController.class.php 管理后台导出权限添加
SeoController.class.php
ServerController.class.php 管理后台导出权限添加
ServerNoticeController.class.php 管理后台导出权限添加
SettlementController.class.php 管理后台日志唯一键值修改
ShareRecordController.class.php
ShiftTaskController.class.php
SiteApplyController.class.php
SiteController.class.php
SpendController.class.php 充值订单bug修改
SpendCountSetController.class.php 修改月结月份显示错误问题
SpendDistinctionController.class.php
StatController.class.php arpu分析bug修正
StatementController.class.php 管理后台日志唯一键值bug修改
StatementMangementController.class.php upt
StatisticsController.class.php Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
StatisticsCountSetController.class.php 将官方渠道修改为江息网络
SuperSignController.class.php
SuperStatisticalController.class.php 导出权限修正
SupportController.class.php 管理后台导出权限添加
TestIpWhiteListController.class.php 苹果beta包添加测试ip白名单
TestOrderController.class.php 平台币增加商户
TestResourceController.class.php 将官方渠道修改为江息网络
TestWhiteListController.class.php 测试白名单bug修改
ThinkController.class.php 礼包管理-操作日志
ThirdPartyIpController.class.php 苹果beta包添加第三方支付名单
TimingController.class.php 市场结算管理市场业绩公式修正
ToolController.class.php 市场结算管理bug修正
UpdateController.class.php
UserActionLogController.class.php 新功能添加
UserController.class.php 市场业绩毛利修改
UserPayWhiteListController.class.php 管理后台导出权限添加
UserWithdrawController.class.php 管理后台导出权限添加
VerifyBillController.class.php 优化结算单确认
WechatController.class.php
WorkOrderController.class.php Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
menu.json