109 Commits (b7409ab069ea0ffc0a09934f42ad90b1b8cf240c)

Author SHA1 Message Date
ELF 15d0b454a4 修改 4 years ago
zhengyongxing b664ba46ad 汇总单代码提交 4 years ago
zhengyongxing 9d43914b17 汇总单结算代码上传 4 years ago
chenzhi 2cf0fdf905 新增公会归属编辑规则修改 5 years ago
chenzhi ec4d180287 优化公会更改 5 years ago
zhengyongxing b768d41935 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
 Conflicts:
	Application/Home/Controller/PackageController.class.php
5 years ago
zhengyongxing 1a0b2dbaba 推广员游戏列表查看全选问题 5 years ago
zhengyongxing 001e9e70f8 管理后台导出权限添加 5 years ago
廖金灵 bab7fec46d Merge branch 'fix/fiancecount_gamename_change' of wmtx/platform into release
游戏名称不含设备类型优化
5 years ago
chenzhi d6e44d32dc 优化推广员申请游戏名称及选择样式 5 years ago
chenzhi 121fc02f18 推广员内外团归属优化2 5 years ago
chenzhi 55d49e8b4b 优化推广公会列表导出 5 years ago
chenzhi 1761d37b5c 推广公会列表 适配新内外团规则 5 years ago
chenzhi d7662eb305 推广员现在归属于公司团体 5 years ago
chenzhi dd86a85485 推广公会归属管理 改为公会归属不可选择 5 years ago
chenzhi d7737291ed 暂存1 5 years ago
chenzhi 0344471659 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release 5 years ago
chenzhi cfbbf8e76b 优化默认公司名称为海南万盟天下科技 5 years ago
liuweiwen 3b415976eb 增加易宝支付 5 years ago
chenxiaojun 23f38f6a07 推广平台>财务管理>结算中心--更新 5 years ago
liuweiwen 4cb88be352 数据权限 5 years ago
yulingwei e26f517df1 冲突解决 5 years ago
yulingwei dfe52865bd upt 5 years ago
zhengchanglong 99f62f3c14 Merge branch 'feature/admin_optimize' into release
# Conflicts:
#	Data/update.sql
5 years ago
liuweiwen a1c3ad8fb3 数据展示权限 5 years ago
chenxiaojun b7d2931106 管理后台--更新 5 years ago
chenxiaojun e9dae29deb 管理后台>推广员>推广员管理>推广员列表--新增资质认证 5 years ago
yulingwei 2cd5574de7 新增审核时间 5 years ago
jbRotk 5d315d4182 添加工会类型 5 years ago
jbRotk 65461ff200 c 5 years ago
liuweiwen 0fba64c6f1 数据展示权限:勾选权限时,*号屏蔽的地方要开放,另没数据权限的地方补上 5 years ago
ELF 6993d164a3 解决冲突 5 years ago
zhengchanglong 9961448831 Merge branch 'release' into dev 5 years ago
liuweiwen 490b6a3369 工会归属隐藏导出 5 years ago
ELF 0d45be780f 解决冲突 5 years ago
chenxiaojun 5a75ea406a 更新 5 years ago
liuweiwen ccca9fb0bd 管理后台-》推广员列表可关键内外团搜索 5 years ago
yulingwei 23f2334e45 新增充值权限查看 5 years ago
zhengchanglong d054e70c73 Merge branch 'release' into dev
# Conflicts:
#	Application/Admin/Controller/MemberController.class.php
#	Application/Admin/View/Promote/belong_edit.html
5 years ago
liuweiwen 5a633ccb49 工会归属申请时间日期格式化 5 years ago
liuweiwen 822ec35ff8 Merge branch 'feature/group_type' into release 5 years ago
liuweiwen 2b3099a2d8 工会归属会长不可编辑 5 years ago
ELF a31e42b7c4 Merge branch 'hotfix/link_info' into release 5 years ago
ELF 0f44d9e95c 解决冲突 5 years ago
liuweiwen 7431072bbf 从dev复制代码 5 years ago
liuweiwen af28ff9155 工会归属查询 5 years ago
zhengchanglong 1c00290da9 Merge branch 'feature/group_type' into dev
# Conflicts:
#	Data/update.sql
5 years ago
chenxiaojun d995675829 更新 5 years ago
chenxiaojun 1594500eca 资质认证--更新 5 years ago
liuweiwen 394a3e4bb5 cp/工会对账系统 5 years ago