zhengchanglong a4dc55f4e3 Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
#	Data/update.sql
..
ActionModel.class.php initial
AddonsModel.class.php initial
AdvModel.class.php initial
AdvPosModel.class.php initial
AgentModel.class.php initial
AlipayAuthModel.class.php initial
AppApplyModel.class.php initial
AppModel.class.php initial
ApplyModel.class.php initial
AttributeModel.class.php initial
AuthGroupModel.class.php initial
AuthRuleModel.class.php initial
BillModel.class.php initial
BindRechargeModel.class.php initial
BindSpendModel.class.php initial
BoonModel.class.php initial
BusinessAffairsModel.class.php fix grand_id
CategoryModel.class.php initial
ChannelModel.class.php initial
CheckModel.class.php initial
CoinPayOrderModel.class.php 新增线下充值审核
CommentModel.class.php initial
ConfigModel.class.php initial
DeductBindRecordModel.class.php initial
DemoModel.class.php initial
DepositModel.class.php initial
DevelopersModel.class.php initial
DeviceRecordModel.class.php 后台数据分析应用概况优化
DocumentModel.class.php webuploader插件
FileModel.class.php initial
GameModel.class.php initial
GameSourceModel.class.php initial
GameTypeModel.class.php initial
GiftRecordModel.class.php initial
GiftbagModel.class.php initial
GuessModel.class.php initial
HooksModel.class.php initial
LaunchDataModel.class.php initial
LaunchPlatformModel.class.php initial
LaunchRecordModel.class.php initial
LinksModel.class.php initial
MemberModel.class.php upt
MendModel.class.php initial
MenuModel.class.php initial
MerchandiseModel.class.php initial
MessageModel.class.php initial
ModelModel.class.php initial
MsgModel.class.php initial
NoticeModel.class.php initial
OpentypeModel.class.php initial
OrderModel.class.php initial
PictureModel.class.php initial
PointRecordModel.class.php initial
PointShopModel.class.php initial
PointShopRecordModel.class.php initial
PointTypeModel.class.php initial
PromoteCoinModel.class.php initial
PromoteGiftModel.class.php initial
PromoteModel.class.php Merge branch 'dev' of 47.111.118.107:/srv/git/platform into feature/promote
PromoteWelfareModel.class.php initial
ProtectLogModel.class.php 测试功能移交到总管理后台,扶持号管理bug修正
ProvideModel.class.php initial
ProvideUserModel.class.php initial
PushModel.class.php initial
PushNoticeModel.class.php initial
RebateListModel.class.php upt
RebateModel.class.php initial
RepairRecordModel.class.php initial
ServerModel.class.php initial
SettlementModel.class.php initial
ShareRecordModel.class.php initial
SiteApplyModel.class.php initial
SpendCountModel.class.php 财务管理功能添加
SpendDistinctionModel.class.php initial
SpendModel.class.php 管理后台->游戏订单->游戏充值--更新
TabModel.class.php initial
TestResourceModel.class.php 测试功能移交到总管理后台,扶持号管理bug修正
TotalSettlementModel.class.php initial
UrlModel.class.php initial
UserCoinModel.class.php initial
UserLoginRecordModel.class.php initial
UserModel.class.php 修改代码
UserPlayInfoModel.class.php initial
UserPlayModel.class.php initial
WithdrawGoldCoinModel.class.php initial
WithdrawModel.class.php initial
bfPictureModel.class.php initial