Commit Graph

151 Commits (608d24b7320d88f56697d9e500cb43236b780727)

Author SHA1 Message Date
ELF c888915daa Merge branch 'hotfix/query' into dev
ELF ece317d6fa 修改bug
zyx 91b773d974 开服信息,平台显示修正
zyx 9eb36bd81f 组长账号显示测试资源
chenxiaojun 7d8f7b53e6 ios13.1绑定提示修改 下级推广员查询bug修复
chenxiaojun cff2dc911a 获取下级推广员bug修改
zyx 66ced8930e 首页bug解决
ELF 24b1441632 修改超级签链接
zyx dd3e56d27c Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 72036e51e3 首页时间问题修正,快捷菜单10个限制添加
ELF 2638929031 通过帐号隐藏目录
elf@home f7aaa9030e 修改bug
elf@home 4c5473a27f 修改bug
chenxiaojun a7f2695665 无检索条件默认包括本账号
chenxiaojun e3d0e885f2 无检索条件默认包括本账号
zhengchanglong a6398b488f Merge branch 'dev_zcl' into dev
# Conflicts:
#	Data/update.sql
ELF db956a2d77 修改bug
ELF cc9aa1a640 解决冲突
zyx bd572379b0 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 5c5d879710 资源日志bug修复
ELF 84174b18e9 修改bug
chenzhi d8095f3397 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev-cz
zyx f64225cff0 测试功能移交到总管理后台,扶持号管理bug修正
ELF 91866f4433 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF d9e7a55af4 修改bug
chenxiaojun 80e2a7e0fa 订单查询、注册明细->组长与推广员组合检索bug修复
chenxiaojun 57c9c7419a 订单查询、注册明细->组长与推广员组合检索bug修复
chenxiaojun 837d168f2d 每日概况、数据汇总、订单查询、注册明细 组长检索bug修复
chenxiaojun 307146cd3c 每日概况、数据汇总、订单查询、注册明细 组长检索bug修复
chenxiaojun 203e2df7c8 数据管理->订单查询->支付方式检索bug修复
chenxiaojun a01c8f04b8 数据管理->订单查询->支付方式检索bug修复
zhengchanglong 308903d396 Merge branch 'dev-cz' into dev_zcl
# Conflicts:
#	Application/Sdk/Controller/Ipa365Controller.class.php
zhengchanglong bb0a399ef7 推广员平台币支付 支付宝支付账户信息重配置文件读取
ELF b2f357608f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF c715996821 修改bug
chenxiaojun 4e7904c3de 订单查询支付方式修改
zyx e4be69d796 Merge branch 'dev' of 47.111.118.107:/srv/git/platform
zyx 3ed9092e07 首页功能隐藏
chenxiaojun b426a6e153 订单查询 注册明细
chenxiaojun 5e75ed2480 订单查询 注册明细
zyx eab8135549 首页添加日志及未读提醒功能
ELF 5dd9df5cd5 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 8bea436dee 修改
chenxiaojun 66b86e074e 数据汇总 每日概况
chenxiaojun 52d9da8f1d 数据汇总 每日概况
ELF 580a531bc4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 24cbe37faa 修改bugt
chenxiaojun 329c9d1514 数据汇总 每日概况
chenxiaojun 3fc4438754 数据汇总 每日概况
chenxiaojun 9ef95cdabf 数据汇总 每日概况