Commit Graph

35 Commits (69adcbabf8bf9b73e1271338d404f14fb0018e52)

Author SHA1 Message Date
zhengyongxing 2ce274486d 官方渠道修改江息网络
zhengyongxing 001e9e70f8 管理后台导出权限添加
sunke 7da471b6ee 支付时间
liuweiwen ad48df6c91 数据展示权限
chenzhi 5e08bda6c2 优化行为日志区服名称为区服id
zhanglingsheng e709816781 补单记录
zhanglingsheng ca401adbd0 补单记录
zhanglingsheng b88f395c9a 补单记录
zhanglingsheng 087a935c45 补单记录
zhanglingsheng 93123b3b95 订单记录
zhengchanglong 484972e9f2 Merge branch 'release-1.0.0' into dev
zhengchanglong 1ca183b547 非管理员数据加密显示
zhengchanglong 4968ace29d Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Home/Controller/DownloadController.class.php
ELF b36e1f1bc9 解决冲突
zhengchanglong 39b6e98f3b Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Application/Admin/Controller/BehaviorLogController.class.php
#	Application/Admin/Controller/ExportController.class.php
#	Data/update.sql
zhanglingsheng 2ec116a017 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng a9c2207ba2 行为日志
zhanglingsheng 855b567a02 行为日志
zhengyongxing 7779535fb6 数据权限
zhanglingsheng f3a80b73b8 行为日志显示bug
zhanglingsheng c6a89f5fe1 行为日志BUG
zhanglingsheng eaa5066324 行为日志bug
zhanglingsheng 7f9ec687cb 行为日志显示bug
zhanglingsheng 375bbac885 行为日志
zhanglingsheng eaf1cb3f17 游戏区服联动修改
zhanglingsheng 47628f2981 游戏充值预下单
zhanglingsheng fb425d3e91 游戏充值预下单
zhanglingsheng e949a4a60b 游戏充值预下单
zhanglingsheng 95f7acd6ff 游戏充值预下单
zhanglingsheng 65e1ddbd93 游戏充值预下单
zhanglingsheng 5d01cb1ff5 游戏充值预下单
zhanglingsheng 6d2c4fc3a2 游戏充值预下单
zhanglingsheng 3a20c68117 游戏充值预下单修改
zhanglingsheng f8498638ad 游戏充值行为日志
zhanglingsheng f392ad4de0 游戏充值行为日志