You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
zhengchanglong 4968ace29d Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Home/Controller/DownloadController.class.php
5 years ago
..
AddonsController.class.php 测试git 5 years ago
ApplyController.class.php 修改bug 5 years ago
ArticleController.class.php 公告 5 years ago
BaseController.class.php 推广后台->安全密码|财务管理--调整 5 years ago
ChargeController.class.php
ClineController.class.php
CoinOrderController.class.php [bug]修改推广后台平台币充值手续费 5 years ago
DiscountController.class.php
DownController.class.php 修改bug 5 years ago
DownloadController.class.php 解决冲突 5 years ago
EmptyController.class.php
ExportController.class.php
FileController.class.php 认证信息 5 years ago
FinanceController.class.php 推广平台->数据管理-订单查询|数据管理-充值统计|财务管理-结算明细--新增合计 5 years ago
GameDivideController.class.php 推广后台->安全密码|财务管理--调整 5 years ago
HomeController.class.php 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新 5 years ago
IndexController.class.php 推广平台->退出登录--更新 5 years ago
OssController.class.php
PackageController.class.php 修改bug 5 years ago
PlayersController.class.php 增加extend判断 5 years ago
PlistController.class.php
PosterController.class.php
PromoteCoinController.class.php 修改bug 5 years ago
PromoteController.class.php Merge branch 'release-1.0.0' 5 years ago
PromoteGiftController.class.php
QueryController.class.php 推广平台>数据管理>充值玩家--更新 5 years ago
SafeController.class.php 修改bug 5 years ago
SiteAdvController.class.php
SiteApplyController.class.php
SiteBaseController.class.php
SiteGameController.class.php
SiteGiftController.class.php
SiteGroupController.class.php
SiteServerController.class.php
SupportController.class.php
TestResourceController.class.php 扶持号管理更名为测试号管理 5 years ago
UserController.class.php