13 Commits (ec273ab157cd8c56e3df52fe315d4f36dd620037)

Author SHA1 Message Date
zhengchanglong e08a2eb3ce Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Application/Admin/Controller/access_data_foldline.txt
#	Data/update.sql
5 years ago
zhengchanglong 7c7ec4fc1d Merge branch 'dev_permission' into release-1.0.0
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Admin/Controller/BehaviorLogController.class.php
#	Application/Admin/Controller/ExportController.class.php
5 years ago
zhanglingsheng f3dd820ca1 Merge branch 'release-1.0.0' into dev 5 years ago
zhanglingsheng 2a5dccdab8 游戏充值预下单 5 years ago
zhanglingsheng 33c3fd1d0d 游戏联动查询 5 years ago
zhanglingsheng 31af192402 解决冲突 5 years ago
zhanglingsheng 8f75d0f450 游戏 5 years ago
zhanglingsheng 24d47089dd 游戏预充值 5 years ago
zhanglingsheng 0e0f603d13 游戏充值预下单 5 years ago
zhengyongxing 6dc8366018 数据授权修改内容提交 5 years ago
zhanglingsheng 3a20c68117 游戏充值预下单修改 5 years ago
zhanglingsheng ad97083c9f 行为日志文案 5 years ago
zhanglingsheng f392ad4de0 游戏充值行为日志 5 years ago