138 Commits (0dbbfb763d1b19ed98d0b17ac06b256a5cc41b9a)

Author SHA1 Message Date
chenxiaojun a7f2695665 无检索条件默认包括本账号 5 years ago
chenxiaojun e3d0e885f2 无检索条件默认包括本账号 5 years ago
zhengchanglong a6398b488f Merge branch 'dev_zcl' into dev
# Conflicts:
#	Data/update.sql
5 years ago
ELF db956a2d77 修改bug 5 years ago
ELF cc9aa1a640 解决冲突 5 years ago
zyx bd572379b0 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zyx 5c5d879710 资源日志bug修复 5 years ago
ELF 84174b18e9 修改bug 5 years ago
chenzhi d8095f3397 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
zyx f64225cff0 测试功能移交到总管理后台,扶持号管理bug修正 5 years ago
ELF 91866f4433 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF d9e7a55af4 修改bug 5 years ago
chenxiaojun 80e2a7e0fa 订单查询、注册明细->组长与推广员组合检索bug修复 5 years ago
chenxiaojun 57c9c7419a 订单查询、注册明细->组长与推广员组合检索bug修复 5 years ago
chenxiaojun 837d168f2d 每日概况、数据汇总、订单查询、注册明细 组长检索bug修复 5 years ago
chenxiaojun 307146cd3c 每日概况、数据汇总、订单查询、注册明细 组长检索bug修复 5 years ago
chenxiaojun 203e2df7c8 数据管理->订单查询->支付方式检索bug修复 5 years ago
chenxiaojun a01c8f04b8 数据管理->订单查询->支付方式检索bug修复 5 years ago
zhengchanglong 308903d396 Merge branch 'dev-cz' into dev_zcl
# Conflicts:
#	Application/Sdk/Controller/Ipa365Controller.class.php
5 years ago
zhengchanglong bb0a399ef7 推广员平台币支付 支付宝支付账户信息重配置文件读取 5 years ago
ELF b2f357608f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF c715996821 修改bug 5 years ago
chenxiaojun 4e7904c3de 订单查询支付方式修改 5 years ago
zyx e4be69d796 Merge branch 'dev' of 47.111.118.107:/srv/git/platform 5 years ago
zyx 3ed9092e07 首页功能隐藏 5 years ago
chenxiaojun b426a6e153 订单查询 注册明细 5 years ago
chenxiaojun 5e75ed2480 订单查询 注册明细 5 years ago
zyx eab8135549 首页添加日志及未读提醒功能 5 years ago
ELF 5dd9df5cd5 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 8bea436dee 修改 5 years ago
chenxiaojun 66b86e074e 数据汇总 每日概况 5 years ago
chenxiaojun 52d9da8f1d 数据汇总 每日概况 5 years ago
ELF 580a531bc4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 24cbe37faa 修改bugt 5 years ago
chenxiaojun 329c9d1514 数据汇总 每日概况 5 years ago
chenxiaojun 3fc4438754 数据汇总 每日概况 5 years ago
chenxiaojun 9ef95cdabf 数据汇总 每日概况 5 years ago
chenxiaojun a5bd8c25c4 数据汇总 每日概况 5 years ago
ELF 4c4d3255d7 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 8ce7442062 修改bug 5 years ago
chenxiaojun c678968253 数据汇总 5 years ago
chenxiaojun e53268815c 数据汇总 5 years ago
chenxiaojun 9de8e33ba9 数据汇总 5 years ago
chenxiaojun 809778b449 数据汇总更新 5 years ago
ELF e610500db6 修改时间插件默认值显示bug 5 years ago
ELF 06bfdbca93 解决冲突 5 years ago
elf@home cda67249ac 修改 5 years ago
ELF d3412cc3ce 测试 5 years ago
zyx 700ac00fbc 测试资源title标签补全 5 years ago
sunke ae666881ed 修改专区防错 5 years ago