40 Commits (c6588a4c35d79b2535bb289bb242464a00c8fb1e)

Author	SHA1	Message	Date
liuweiwen	e30f2f9601	Merge branch 'dev' into dev_lww ... # Conflicts: # Application/Admin/Controller/FileController.class.php # Application/Admin/Controller/GameController.class.php # Application/Admin/View/Game/edit.html # Application/Home/Controller/HomeController.class.php # Application/Home/View/default/Home/landingPage.html # Public/Home/css/index2.css	5 years ago
ELF	bb2996dbee	迁移忽略结算	5 years ago
ELF	289b40329f	添加换绑时金额	5 years ago
liuweiwen	1693f7fa98	推广公司	5 years ago
liuweiwen	d51725f1af	新增推广员时，新增推广所属公司	5 years ago
ELF	81a968947b	修改bug	5 years ago
ELF	ef60ca85cf	修改	5 years ago
ELF	a91a5d5759	修改	5 years ago
ELF	128c11f5b8	修改	5 years ago
ELF	25fa79ea55	修改玩家迁移	5 years ago
sunke	401edecd61	target_level	5 years ago
sunke	8951a502c2	修改bug	5 years ago
sunke	94bede9a41	平台币修改	5 years ago
sunke	c3caed08b3	bug	5 years ago
ELF	6cdee448c0	修改bug	5 years ago
ELF	1bffd62357	修改bug	5 years ago
ELF	1a0175e583	修改结构	5 years ago
ELF	e56256ba1d	修改bug	5 years ago
ELF	c4d35c26d4	修改bug	5 years ago
ELF	85e466c3fd	修改bug	5 years ago
ELF	e27c5a5266	修改bug	5 years ago
ELF	b2df7e0fe3	修改bug	5 years ago
ELF	fbce375679	修改bug	5 years ago
ELF	3d46a55811	修改bug	5 years ago
ELF	c88892ec59	修改	5 years ago
ELF	784de48bf9	修改bug	5 years ago
ELF	c2c8f11d01	修改	5 years ago
ELF	070cc2e7c2	修改bug	5 years ago
ELF	edc6a7be73	修改冲突	5 years ago
ELF	9abb4ebb2c	修改	5 years ago
chenzhi	7e37f3a2df	优化迁移用户addshifttask	5 years ago
ELF	f056143dee	修改bug	5 years ago
ELF	08774a0954	完善添加推广员	5 years ago
ELF	fc89281a48	3级变4级修改	5 years ago
ELF	edc40b8a1b	ss	5 years ago
ELF	689cc08b69	修改	5 years ago
ELF	22dcca566b	修改	5 years ago
ELF	5b62b99765	三级变四级	5 years ago
ELF	ca9f2baf1d	修改推广员流水订单生成方式	5 years ago
ELF	2ffa024c4c	initial	5 years ago