Commit Graph

4516 Commits (b8d4204ef9b05228a6cf714e1ae1d2106a37e188)
 

Author SHA1 Message Date
chenzhi 7141e3752e 优化操作日志基函数
chenzhi a8c83122db Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into feature/operation_log
chenzhi 148d445f10 用户新增导出操作日志
zhengyongxing ce59d5dc72 Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log
zhengyongxing 3f4f39e238 封装时间函数
chenzhi 580eb9dea3 优化移动公共函数后的变化
zhengyongxing 756b3b9975 操作日志公用函数移到extend.php中
chenzhi 2de1d9bccb 优化批量操作
liuweiwen 02920aab8a 资源审核配置列表、新增、编辑、删除、锁定、解锁
chenzhi 02407d1c50 优化操作日志函数
zhengyongxing dd478e264f 行为日志按照原型修改完成
zhanglingsheng c8296c0412 身份证数据添加info字段
zhengyongxing 1aa12fe2d1 Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log
zhengyongxing d2867b4635 行为日志完成
chenzhi bd53d01a0e 用户编辑优化
chenzhi 80f8eb431c 用户编辑结束
chenzhi 6dfb13e4d9 新增操作权限
万盟天下 403a5bccfd Merge branch 'hotfix/memory_set' of wmtx/platform into master
优化平台币回收内存
chenzhi 0d4ca0840b 优化平台币回收内存
万盟天下 b7a52bfed7 Merge branch 'hotfix/role_show_update' of wmtx/platform into master
角色列表角色ID和角色名改为不受权限控制
zhengchanglong 7d13703398 角色列表角色ID和角色名改为不受权限控制
万盟天下 9a54d402b5 Merge branch 'release' of wmtx/platform into master
版本更新
万盟天下 5011e4867d Merge branch 'release' of wmtx/platform into master
版本更新
liuweiwen ad48df6c91 数据展示权限
liuweiwen 446e6f8176 Merge remote-tracking branch 'origin/release' into release
liuweiwen 3f5739c1d7 游戏充值和平台币充值数据展示权限
zhanglingsheng 2c7eb8f191 支付类型添加易宝支付
zhanglingsheng a1b79b57ae Merge branch 'release' of 47.111.118.107:wmtx/platform into release
zhanglingsheng 31466db00d 支付类型添加易宝支付
zhengyongxing 009ef6719d 结算单管理审核状态bug修改
zhengyongxing 601151718f Merge branch 'feature/admin_optimize' into release
zhengyongxing e01bcc236f Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
zhengyongxing 260ca6fe9e 结算单管理审核状态bug修改
zhengchanglong 6b68ae8197 Merge branch 'feature/admin_optimize' into release
# Conflicts:
#	Data/update.sql
zhengchanglong eecd38e424 Merge branch 'fix/divide_test' into release
sunke 2a4e3944ec 电子文档样式
sunke 6e2069dff9 电子文档样式问题
liuweiwen 2cf7b7471f Merge remote-tracking branch 'origin/release' into release
liuweiwen 305cbf34cd 导航高亮
liuweiwen 941ba5628d Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
liuweiwen c05b10cb87 对账单系统-》未审核不可确认
ELF 5627dd94d2 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
ELF 7cd28cc7ce 删除多余代码
yulingwei e2851c13f1 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
yulingwei 5dde3ef96e upt
ELF 3411f90430 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
ELF 9ddf8bc475 Merge branch 'feature/promote_deposit' into release
ELF dad83c8d38 押金付款方式添加选项
yulingwei dc96411757 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
yulingwei 0513f0fa5e fix bug