185 Commits (ef891050c98853e911faed3ddcc7e1fce6b4e152)

Author SHA1 Message Date
chenzhi f169d65c1c 优化推广公司添加排序 4 years ago
ELF 050eb98843 xiugai 4 years ago
ELF 2c9092273f 修改 4 years ago
elf@home 1dd594f46f 修改bug 4 years ago
ELF 268e084241 修改 4 years ago
ELF 9d67a4c842 优化 4 years ago
ELF 6596e01a29 修改 4 years ago
ELF 32bc839dcd 合并 4 years ago
ELF e0bbec0978 修改 4 years ago
ELF 7614d5feca 修改 4 years ago
ELF e441f030c0 优化 4 years ago
ELF e9038d7471 ss 4 years ago
ELF 296e378501 修改 4 years ago
ELF e4854aca3a 修改 4 years ago
ELF 1a14ed8dc7 修改 4 years ago
elf@home 50755b89c5 修改 4 years ago
ELF cc6c5d4e74 修改 4 years ago
ELF 2867a05bb3 修改 4 years ago
ELF c7390f4c2e bug修复 4 years ago
ELF e249596014 修改 4 years ago
ELF 550da5cb37 测试 4 years ago
ELF 06c4d5f1f1 优化测试资源 4 years ago
ELF fa90dc0bc8 修改 4 years ago
ELF c9cd377d4f 修改 4 years ago
ELF 367345ea8d 修改 4 years ago
ELF ecf460e7c9 修改 4 years ago
ELF 49751b8760 测试资源修改 4 years ago
ELF edb090feca 解决冲突 4 years ago
ELF 004b540a63 解决冲突 4 years ago
zhengyongxing 4f681f7d72 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Data/update.sql
4 years ago
ELF 56282658fc 解决冲突 4 years ago
ELF 0206a422f9 解决冲突 4 years ago
ELF 62d7f15fdc Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_landing_assign 4 years ago
zhengyongxing 4c3112b70e 充值信息查看权限添加 4 years ago
ELF 46fc13a91e 修改 4 years ago
ELF 1bec15c186 修改迁移bug 4 years ago
ELF f3b323bda8 修改 4 years ago
yulingwei eaa25ebcda feature/desposit 4 years ago
ELF 096e32d581 商户配置 4 years ago
ELF e8a925b64c 游戏统计添加聚合充值数据 4 years ago
ELF 15d0b454a4 修改 4 years ago
ELF 990a2bd206 解决冲突 4 years ago
ELF 102e77267d 修改bug 4 years ago
ELF e94b6418f1 修改 4 years ago
ELF 8224cfb362 修改 4 years ago
ELF 77c692c44d 修改 4 years ago
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
4 years ago
zhengyongxing a8f4f16349 Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/view.html
#	Data/update.sql
4 years ago
ELF 34691d6baa 修改 4 years ago
ELF 76fcfec7c2 修改 4 years ago