Commit Graph

99 Commits (30aff2bd38b623601a377a6dfb2f07bc776bef9f)

Author SHA1 Message Date
chenzhi 2a7d4a435c Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
zhengchanglong 78846c699f Merge branch 'dev_zyx' into dev
zyx 9539b38e86 月结统计提示语修改
jbrazz 48b1cdf66f upt
zhengchanglong 3c3a13c068 Merge branch 'dev_zyx' into dev
zyx cfa33d3e42 月结统计提示语修改
jbrazz a8125bf377 upt
zhengchanglong 9dd5a34bf7 Merge branch 'dev_zyx' into dev
chenzhi 50c775a78b Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi f9397efebf 修改总流水统计方式
zhengchanglong 6dcd1549d0 Merge branch 'dev_zyx' into dev
# Conflicts:
#	Data/update.sql
zyx 5a7432ef40 月结统计新增平台比收入字段,将平台币流水改为平台币支出
zyx b6080180ab 测试资源bug修正
zhengchanglong 2c80186025 Merge branch 'dev_zyx' into dev
zyx 27e8a0c0b5 提示栏文字调整,组长渠道与推广员渠道添加文字提示栏
zyx 414f471ac1 提示栏文字调整
zhengchanglong bf24f74d00 Merge branch 'dev_zyx' into dev
zyx 7167366949 提示栏文字调整
zyx 064a3d0098 搜索框样式调整
zyx 6f77f576d1 标签位置调整
zyx bbc75a419d bug修正,样式更新
zhengchanglong cd70dd7dd8 Merge branch 'dev_zyx' into dev
zyx 62311eb40d 月结统计bug修正
zyx 515ffa25b9 月结统计bug修正
Your Name dce059abe5 SDK菜单修改
Your Name 7466b90d13 SDK菜单修改
Your Name ed3ce2b4b5 SDK菜单修改
Your Name c3762b420c SDK菜单修改
Your Name 2569850407 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
Your Name c90c397dd9 SDK菜单修改
zyx 2adc07ec4a 组长月结统计页面文字修正
zyx 4803bd4a1b 组长月结统计页面修正
zhengchanglong e69bc5f459 Merge branch 'dev_zyx' into dev
zyx 63dff98660 月结统计导出bug修正
zyx 1d59721ee2 月结统计导出bug修正
zyx b42f621dbc 财务管理功能提交
zyx ee5dccfaeb 财务管理功能代码完善
jbrazz b78c6228b0 Merge branch 'hotfix/fix_bug' into dev
zyx 54a01da982 财务管理功能完善
zyx fe8a60093f 新增渠道模板提交
zyx d3de669837 '代码合并'
jbrazz 8859c847f6 upt
chenxiaojun 3be42d0186 管理后台->统计->新增->其他注册统计|官方渠道统计
chenxiaojun e247c7dedf 管理后台->统计->新增->其他注册统计|官方渠道统计
zyx 24cdd7086b '合并代码'
sunke 021673f657 图片上传补充
sunke 692a1bcc11 webuploader插件
zyx c65aa8d69a 财务管理bug修正,导出功能,合作方列表添加
zyx 224c745ba8 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx
zyx 112316c395 财务管理功能添加