Commit Graph

1678 Commits (391b997f182963615307b96f6e19e0a7e90feb70)
 

Author SHA1 Message Date
zhengchanglong 38db1f3dca Merge branch 'feature/promote' into dev_zcl
# Conflicts:
#	Application/Admin/Controller/IndexChartSetController.class.php
yulingwei 24d3e6ab07 修改bug
yulingwei 046beee6be 修改bug
zhengchanglong a4dc55f4e3 Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
#	Data/update.sql
zhengchanglong 65014bb66a Merge branch 'dev_lww' into dev_zcl
zhengchanglong 974a9d93e4 Merge branch 'dev-cz' into dev_zcl
# Conflicts:
#	Data/update.sql
zhengyongxing f4cb9a98c8 数据管理启动机型代码优化
zhengyongxing 2fb1effdcd 后台数据分析应用概况优化
“用lww c1b5569213 手机官网-手机注册与账号注册修改,昵称自动生成
sunke 05bb9b4aa3 推广业绩导出修复
chenxiaojun 232a6f7918 修改冲突
chenxiaojun 5d2f499cfd Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengchanglong aa8e612ead 超级签测试金额修改
ELF 3ebaf13810 修改bug
“用lww ff976bb9eb pc端问题反馈修改
“用lww a13e8a5152 Merge remote-tracking branch 'origin/dev' into dev_lww
ELF e5ce5ded1a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 270e24346d 修改bug
sunke 776d8acbd8 代办顺序修改
ELF e575e3107c 调试
ELF b69699f5d0 代码还原
ELF 1fd7023c5f 代码优化
ELF c75d1bf3ad Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 9e1c25a2a3 修改bug
sunke 158d8e8fc2 认证图片隐藏
sunke ae34a5e64b 代办事项
chenzhi 255d830229 优化提示及输入ok
chenzhi 16d1a28f67 优化提示2
chenzhi 8be0cfb188 优化提示
chenzhi 22b0738203 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 7149c94d19 测试
sunke d941477d47 时间检索 资质认证
chenxiaojun de9a8d6eb8 推广平台->数据管理->订单查询|注册明细--更新
chenxiaojun d5d555bde2 推广平台->数据管理->订单查询|注册明细--更新
chenxiaojun 0a075aed45 推广平台->数据管理->订单查询|注册明细--更新
chenzhi 6e522e08cd Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi a6f52ccdb8 优化注册管理员提示信息
chenxiaojun b606ee5765 推广平台->数据管理->订单查询|注册明细--更新
zhanglingsheng a514e5b5dc 支付方式添加快捷
zhanglingsheng e07e1ff2aa 支付方式添加快捷
chenzhi 29d204bf97 修复添加管理员报错
chenzhi a29227c2cd 数据库data更新
chenzhi 360cf3f3ba 优化前端展示
chenxiaojun d8acd44d08 推广平台->数据管理->数据汇总--更新
chenxiaojun 67af68fc43 推广平台->数据管理->数据汇总--更新
sunke e31ad349ae register get method
chenzhi 04c5f17790 优化脚本
ELF b4afa5d8b2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 065245d657 优化查询
sunke ffd7221f1d think