Commit Graph

5918 Commits (c6b3d1948e8adb8834841d423f236e96eb67cbfe)
 

Author SHA1 Message Date
ELF 6cdee448c0 修改bug
ELF 73cd26c1a4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 1bffd62357 修改bug
sunke 055b5df6e7 增加条件
ELF 90d5d53994 解决冲突
ELF b0b3d3f80d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 9d19a2ce6b 修改冲突
ELF c1d05093e1 修改bug
sunke f6ab43f3f7 平台币转移
ELF 82c45808f2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 4f41651654 修改bug
zhanglingsheng 656e9b7231 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng fb0808445f 悬浮球加类型
sunke 1f34a3a0ce 平台币明细,sdk菜单图片上传
chenxiaojun 731d7cb482 推广平台->平台币管理->我的平台币->检索样式调整
ELF 219aae771e Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF 2c608a73c9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 1a0175e583 修改结构
yulingwei cf67739a9e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 44954031bf upt
chenxiaojun f8abfa9995 推广平台--日期检索调整
zhengchanglong 5a56b41330 Merge branch 'feature/promote' into dev
zyx fd74d8d144 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
zyx cbe9117e3d 充值界面bug修复
chenxiaojun db249a776e 推广平台->财务管理->提现记录->提现明细--检索调整
yulingwei 0d258c1d8d upt
chenxiaojun fa2efa0431 推广平台->游戏管理->我的游戏--检索样式调整
zhengchanglong 2e5973cf3b 删除冗余文件
zhengchanglong c781a9c1be Merge branch 'feature/promote' into dev
zyx 2b012aad08 我的礼包界面功能完善
sunke f61585967b achieve
sunke e28a33f6e6 设置同意协议
zyx 0d090ded9b 礼包界面
chenzhi 5d454e5429 我的游戏
chenzhi ad6eb5b0d7 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi bf728438d7 优化
zhengchanglong 16d54e6add Merge branch 'feature/promote' into dev
zyx 938c4e9eda Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
zyx 8f0ae7dd8b 充值界面模板嵌套
sunke 5bba1e5df4 游戏推广协议
chenzhi 9764d361f1 123
chenzhi fbf8a76ec9 123
ELF 17a7045036 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 9e83202467 修改bug
chenzhi 40001277bc login
chenxiaojun ee97f42261 推广平台->数据管理->数据汇总--检索更新
chenxiaojun e2fa14c1c8 推广平台->数据管理->数据汇总->合计--更新
sunke 97a973079a charge
chenzhi 0cd21feb28 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi 44e2623efe 123