Commit Graph

178 Commits (6e2fda1e269fbb23b5ae5d79592d3644c2a900eb)

Author SHA1 Message Date
ELF 32bc839dcd 合并
ELF e0bbec0978 修改
ELF 7614d5feca 修改
ELF e441f030c0 优化
ELF e9038d7471 ss
ELF 296e378501 修改
ELF e4854aca3a 修改
ELF 1a14ed8dc7 修改
elf@home 50755b89c5 修改
ELF cc6c5d4e74 修改
ELF 2867a05bb3 修改
ELF c7390f4c2e bug修复
ELF e249596014 修改
ELF 550da5cb37 测试
ELF 06c4d5f1f1 优化测试资源
ELF fa90dc0bc8 修改
ELF c9cd377d4f 修改
ELF 367345ea8d 修改
ELF ecf460e7c9 修改
ELF 49751b8760 测试资源修改
ELF edb090feca 解决冲突
ELF 004b540a63 解决冲突
zhengyongxing 4f681f7d72 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Data/update.sql
ELF 56282658fc 解决冲突
ELF 0206a422f9 解决冲突
ELF 62d7f15fdc Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_landing_assign
zhengyongxing 4c3112b70e 充值信息查看权限添加
ELF 46fc13a91e 修改
ELF 1bec15c186 修改迁移bug
ELF f3b323bda8 修改
yulingwei eaa25ebcda feature/desposit
ELF 096e32d581 商户配置
ELF e8a925b64c 游戏统计添加聚合充值数据
ELF 15d0b454a4 修改
ELF 990a2bd206 解决冲突
ELF 102e77267d 修改bug
ELF e94b6418f1 修改
ELF 8224cfb362 修改
ELF 77c692c44d 修改
zhengyongxing f63b115641 Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/add.html
#	Application/Admin/View/PromoteCompany/edit.html
zhengyongxing a8f4f16349 Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/view.html
#	Data/update.sql
ELF 34691d6baa 修改
ELF 76fcfec7c2 修改
ELF 5f5a6ee1af 修改
ELF 2d872ed710 解决冲突
ELF a153fb9a0e 修改
zhengyongxing 9d43914b17 汇总单结算代码上传
ELF 69b09c582f 添加落地页限制规则
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络
万盟天下 f7a0d82314 Merge branch 'hotfix/upload_oss' of wmtx/platform into release
修改