1653 Commits (9198c17d5f65e7f2ac1c1d662520cb668dd52314)

Author	SHA1	Message	Date
zhengchanglong	ab46f9f6ec	Merge branch 'feature/promote' into dev	5 years ago
chenxiaojun	83cbc45374	管理后台->游戏订单->游戏充值--日期检索更新	5 years ago
chenxiaojun	a84ea0e679	管理后台->游戏订单->游戏充值--日期检索更新	5 years ago
chenxiaojun	1bf12d3a6d	管理后台->游戏订单->游戏充值--日期检索更新	5 years ago
chenxiaojun	55fe6a2c7d	管理后台->游戏订单->游戏充值--日期检索更新	5 years ago
chenxiaojun	98c69ac360	管理后台->游戏订单->游戏充值--日期检索更新	5 years ago
chenxiaojun	638ceba6cc	管理后台->游戏订单->游戏充值--日期检索更新	5 years ago
zhengyongxing	21579a3e07	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
zhengyongxing	aa5eadaa02	扶持号管理更名为测试号管理	5 years ago
chenxiaojun	33f5cf9ac3	管理后台->游戏订单->游戏充值--更新	5 years ago
chenxiaojun	9075730d83	管理后台->游戏订单->游戏充值--更新	5 years ago
chenxiaojun	37aab8f279	管理后台->游戏订单->游戏充值--列表样式调整	5 years ago
chenxiaojun	f473c0abc1	管理后台->游戏订单->游戏充值--列表样式调整	5 years ago
zhengyongxing	e5d425cd47	订单查询订单信息隐藏，扶持号管理更名为测试号管理	5 years ago
sunke	04e53e2329	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
sunke	165718170a	平台币按钮权限	5 years ago
chenxiaojun	3250d05a01	管理后台->游戏订单->游戏充值--sql优化	5 years ago
chenxiaojun	3fbdc9daa0	管理后台->游戏订单->游戏充值--sql优化	5 years ago
zhengyongxing	29e71cc4fa	文章详情返回按钮回到主页	5 years ago
zhengyongxing	37eda1113d	推广页面图标修改	5 years ago
zhengyongxing	176efd1a88	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
zhengyongxing	c88e759e3b	推广后台bug修复	5 years ago
sunke	d55c4220a1	查询	5 years ago
chenxiaojun	83e8427c8b	cs	5 years ago
ELF	6920cecd99	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
ELF	634ade3ecd	修改bug	5 years ago
sunke	8951a502c2	修改bug	5 years ago
sunke	94bede9a41	平台币修改	5 years ago
sunke	c3caed08b3	bug	5 years ago
yulingwei	c6779497c2	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
yulingwei	d90186b301	付款订单有效性问题	5 years ago
sunke	cf1449f09a	安全下载中心	5 years ago
zhengyongxing	9ff153c1da	测试git	5 years ago
ELF	1c11622eb2	修改bug	5 years ago
ELF	3b681670df	上传	5 years ago
ELF	b0b0056c43	修改bug	5 years ago
ELF	e942f378c6	修改bug	5 years ago
ELF	6cdee448c0	修改bug	5 years ago
ELF	73cd26c1a4	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
ELF	1bffd62357	修改bug	5 years ago
sunke	055b5df6e7	增加条件	5 years ago
ELF	90d5d53994	解决冲突	5 years ago
ELF	b0b3d3f80d	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
ELF	9d19a2ce6b	修改冲突	5 years ago
ELF	c1d05093e1	修改bug	5 years ago
sunke	f6ab43f3f7	平台币转移	5 years ago
ELF	82c45808f2	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
ELF	4f41651654	修改bug	5 years ago
zhanglingsheng	656e9b7231	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
zhanglingsheng	fb0808445f	悬浮球加类型	5 years ago
sunke	1f34a3a0ce	平台币明细，sdk菜单图片上传	5 years ago
chenxiaojun	731d7cb482	推广平台->平台币管理->我的平台币->检索样式调整	5 years ago
ELF	219aae771e	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
ELF	2c608a73c9	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
ELF	1a0175e583	修改结构	5 years ago
yulingwei	cf67739a9e	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
yulingwei	44954031bf	upt	5 years ago
chenxiaojun	f8abfa9995	推广平台--日期检索调整	5 years ago
zhengchanglong	5a56b41330	Merge branch 'feature/promote' into dev	5 years ago
zyx	fd74d8d144	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
zyx	cbe9117e3d	充值界面bug修复	5 years ago
chenxiaojun	db249a776e	推广平台->财务管理->提现记录->提现明细--检索调整	5 years ago
yulingwei	0d258c1d8d	upt	5 years ago
chenxiaojun	fa2efa0431	推广平台->游戏管理->我的游戏--检索样式调整	5 years ago
zhengchanglong	2e5973cf3b	删除冗余文件	5 years ago
zhengchanglong	c781a9c1be	Merge branch 'feature/promote' into dev	5 years ago
zyx	2b012aad08	我的礼包界面功能完善	5 years ago
sunke	f61585967b	achieve	5 years ago
sunke	e28a33f6e6	设置同意协议	5 years ago
zyx	0d090ded9b	礼包界面	5 years ago
chenzhi	5d454e5429	我的游戏	5 years ago
chenzhi	ad6eb5b0d7	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
chenzhi	bf728438d7	优化	5 years ago
zhengchanglong	16d54e6add	Merge branch 'feature/promote' into dev	5 years ago
zyx	938c4e9eda	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
zyx	8f0ae7dd8b	充值界面模板嵌套	5 years ago
sunke	5bba1e5df4	游戏推广协议	5 years ago
chenzhi	9764d361f1	123	5 years ago
chenzhi	fbf8a76ec9	123	5 years ago
ELF	17a7045036	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
ELF	9e83202467	修改bug	5 years ago
chenzhi	40001277bc	login	5 years ago
chenxiaojun	ee97f42261	推广平台->数据管理->数据汇总--检索更新	5 years ago
chenxiaojun	e2fa14c1c8	推广平台->数据管理->数据汇总->合计--更新	5 years ago
sunke	97a973079a	charge	5 years ago
chenzhi	0cd21feb28	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
chenzhi	44e2623efe	123	5 years ago
chenzhi	451ea9588e	base	5 years ago
chenzhi	4b7d9202b7	123	5 years ago
ELF	175e38f712	修改bug	5 years ago
zyx	a0e27f9e7a	覆盖vbs脚本	5 years ago
chenzhi	c3196b7be0	123	5 years ago
chenzhi	b52eee941b	优化	5 years ago
chenzhi	3098558fe0	lww代码合并	5 years ago
chenzhi	4c2e1f294e	去vs	5 years ago
chenzhi	68eead8d31	123	5 years ago
chenzhi	63c5421d49	Merge branch 'dev_lww' of 47.111.118.107:/srv/git/platform into dev_lww	5 years ago
chenzhi	a28acf200d	个人中心	5 years ago
zhengchanglong	5af7ab4e5e	Merge remote-tracking branch 'origin/dev_lww' into dev_lww	5 years ago
zhengchanglong	d9e75cd4c0	充值	5 years ago
chenzhi	71c1ad1437	Merge branch 'dev_lww' of 47.111.118.107:/srv/git/platform into dev_lww	5 years ago
chenzhi	737e7786e8	移动官网手机及账号注册	5 years ago
chenxiaojun	3d9865f507	推广平台->财务管理->结算明细--检索调整	5 years ago
zhengchanglong	0b188b12bb	充值	5 years ago
ELF	5bfecf5fc6	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
chenzhi	2e610bc245	优化手机注册1	5 years ago
ELF	e2d75ec2c6	修改推广后台首页	5 years ago
chenzhi	8ad35726fb	账号注册ok	5 years ago
chenzhi	ddad6f6bf4	优化注册	5 years ago
ELF	16d458155a	修改打包日志	5 years ago
ELF	ed82ea4103	添加打包日志记录	5 years ago
ELF	f90a6a09fb	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
ELF	f2765313fd	优化打包	5 years ago
chenxiaojun	98f43acc96	推广平台->数据管理--检索样式调整	5 years ago
chenxiaojun	486090ca0a	推广平台->财务管理--时间检索提示调整|数据管理->订单查询|注册明细--检索样式调整	5 years ago
chenxiaojun	4ac069e28a	推广平台->财务管理->结算明细--检索调整	5 years ago
yulingwei	5a2e6c2b63	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
yulingwei	6ea4c72416	修改部分导出报表问题	5 years ago
zhengchanglong	acb062ed3e	Merge branch 'feature/promote' into dev	5 years ago
ELF	8968223dd2	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
ELF	6c636a92f5	修改	5 years ago
zyx	102013e527	部长数据统计修正	5 years ago
sunke	3a109a6444	bug修改	5 years ago
zhengchanglong	2783890ac2	修改网页title	5 years ago
dev_lww	c94dc6b3a5	手机官网	5 years ago
dev_lww	584a228fb4	手机官网	5 years ago
sunke	21782ff951	实时刷新可下载状态	5 years ago
ELF	be6357eeac	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
chenxiaojun	00188569fe	推广平台->财务管理->结算中心->提现--bug修复	5 years ago
ELF	e56256ba1d	修改bug	5 years ago
ELF	c4d35c26d4	修改bug	5 years ago
chenxiaojun	669e641c1e	推广平台->财务管理->(结算中心|结算明细--检索日期范围调整)(提现记录->结算单--侧边栏高亮修复)	5 years ago
ELF	905efbfd9a	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
ELF	9fde84f6ca	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
ELF	e4291c48b0	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
ELF	85e466c3fd	修改bug	5 years ago
jbrazz	c8f072f983	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
jbrazz	2a6d9b7571	推广员名称	5 years ago
ELF	3fe3ae5dcd	修改bug	5 years ago
chenxiaojun	9d3dfd622b	推广平台->退出登录--更新	5 years ago
ELF	d112a3c7ff	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
ELF	e58b20b576	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
ELF	e27c5a5266	修改bug	5 years ago
jbrazz	5deb0c2b05	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
jbrazz	8a513767dd	upt	5 years ago
chenxiaojun	467b193037	推广平台->退出登录--更新	5 years ago
sunke	e75907ed07	隐藏用户信息	5 years ago
sunke	9e2bb1e809	安全管理admin后台	5 years ago
ELF	d7b4ec366f	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
chenxiaojun	773ffb5160	管理后台->游戏编辑--更新推广充值CPS比例时同步未提现订单的分成比例 ... 推广平台->数据管理->每日概况|数据汇总--检索日期间隔调整为31天 推广平台->财务管理->结算中心->提现--权限更新	5 years ago
sunke	f8c4f2c0b6	更改下载权限	5 years ago
ELF	b2df7e0fe3	修改bug	5 years ago
ELF	fbce375679	修改bug	5 years ago
“用lww	fa69e8ba83	手机端官网修改	5 years ago
ELF	d9419ae64e	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
ELF	3d46a55811	修改bug	5 years ago
chenxiaojun	6307625efc	管理后台->推广员->结算管理->推广提现->--更新	5 years ago
ELF	efd2ed361f	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
ELF	c88892ec59	修改	5 years ago
sunke	2e37b23f2b	权限控制	5 years ago
ELF	84b36e2d78	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
ELF	784de48bf9	修改bug	5 years ago
jbrazz	8be3ee9560	upt	5 years ago
jbrazz	31948423e0	upt	5 years ago
jbrazz	20c168a537	三级改四级配置	5 years ago
zhengchanglong	d2f547eb9c	Merge branch 'feature/promote' into dev	5 years ago
zhengchanglong	f1f7666e1e	Merge branch 'dev_lww' into feature/promote	5 years ago
zhengchanglong	37bdcc60c8	Merge remote-tracking branch 'origin/feature/promote' into feature/promote	5 years ago
sunke	3b0a6a5479	promote	5 years ago
“用lww	c20f08f9b3	pc端官网修改	5 years ago
sunke	7d474f09cd	推广员	5 years ago
sunke	f592cd0b24	listsIndex.html	5 years ago
ELF	fc028dd272	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
ELF	c2c8f11d01	修改	5 years ago
sunke	c918864264	safeCSS	5 years ago
zhengchanglong	20d8be8807	Merge branch 'dev_lww' into feature/promote	5 years ago
sunke	b94f7b50c2	ajax-get	5 years ago
sunke	d2b1a474fb	ajax-get	5 years ago
sunke	52dafe9ed3	remit	5 years ago
sunke	4fff44e0f8	汇款证明下载	5 years ago
chenxiaojun	c8281d2bb2	管理后台->推广员->结算管理->推广提现->上传汇款证明--更新	5 years ago
chenxiaojun	5afd0ffd63	管理后台->推广员->结算管理->推广提现->上传汇款证明--更新	5 years ago
“用lww	7962cc62b4	pc端官网修改	5 years ago
sunke	908e552b81	base	5 years ago
sunke	129aa74f2e	safe	5 years ago
sunke	f39bff03c2	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
sunke	246f1324f7	loginsafe	5 years ago
ELF	2b2d9d04de	Merge branch 'feature/promote' into dev	5 years ago
ELF	ae66feb819	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
sunke	856446087f	safe	5 years ago
ELF	47e2706e26	修改bug	5 years ago
sunke	d9c9271e17	del safe	5 years ago
“用lww	cf78ecd0cc	pc端官网修改	5 years ago
“用lww	9ef65ced5c	Merge branch 'feature/promote' of D:\workspace\git\platform with conflicts.	5 years ago
chenzhi	484216ae65	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
chenzhi	c11814f902	修改背景	5 years ago
chenxiaojun	d57e4a211f	推广平台->财务管理->提现记录->结算单--更新	5 years ago
ELF	6f4ec4ff30	Merge branch 'feature/promote' into dev	5 years ago
ELF	f1625fec2d	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
ELF	afb6de56f8	添加3级变四级脚本	5 years ago
chenxiaojun	c057c5cf47	管理后台->推广员->结算管理->推广提现->上传汇款证明--格式限制	5 years ago
zhengchanglong	f21403a05b	Merge branch 'dev_lww' into feature/promote	5 years ago
chenxiaojun	578d640524	管理后台->推广员->结算管理->推广提现--更新	5 years ago
sunke	4ea2029976	大小写	5 years ago
chenxiaojun	1c157d78b9	管理后台->推广员->结算管理->推广提现->订单详情--更新	5 years ago
sunke	1d7597d468	修改大小写文件	5 years ago
chenxiaojun	93b2c65db5	推广平台->财务管理->提现记录->汇款证明--更新	5 years ago
ELF	f049d4834c	Merge branch 'feature/promote' into dev	5 years ago
ELF	1eebbeff5d	修改菜单	5 years ago
ELF	68d39bb3c9	Merge branch 'feature/promote' into dev	5 years ago
“用lww	e019e23ca4	pc端官网修改	5 years ago
jbrazz	14081fe0cc	Merge branch 'featurer/ylw_4.0' into dev	5 years ago
jbrazz	3f1b2d34c2	upt	5 years ago
sunke	e8d2879218	下载中心内容补充	5 years ago
zyx	68e57ab1f5	导出链路问题修正	5 years ago
chenxiaojun	0787c976ef	管理后台->推广员->结算管理->推广提现--更新	5 years ago
chenxiaojun	895265a330	管理后台->推广员->结算管理->推广提现--更新	5 years ago
sunke	f948bfbb7d	下载器内容	5 years ago
ELF	ad15ac9d1b	修改页面	5 years ago
ELF	e1115d6632	Merge branch 'feature/promote' into dev	5 years ago
ELF	1fed7cdfc6	修改	5 years ago
ELF	6bf4e10916	Merge branch 'hotfix/oa' of 47.111.118.107:/srv/git/platform into dev	5 years ago
Your Name	a9a95765e2	OA获取信息-手机系统变更消息推送	5 years ago
ELF	f03fec9e43	Merge branch 'feature/promote' into dev	5 years ago
ELF	ed2fbea24c	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
ELF	070cc2e7c2	修改bug	5 years ago
jbrazz	e57dfd3fae	修改设备号查询	5 years ago
jbrazz	f4a46335ca	upt	5 years ago
jbrazz	7396e69a61	upt	5 years ago
jbrazz	380c930686	Merge branch 'featurer/ylw_4.0' into dev	5 years ago
jbrazz	52880f1a91	upt	5 years ago
jbrazz	ea4c861559	upt	5 years ago
zyx	97a1b634b9	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
zyx	0a819757cb	测试资源时间bug修正	5 years ago
zyx	0ce8984c13	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
zyx	ce008b284e	月结统计bug修正	5 years ago
jbrazz	b21df0a8f4	upt	5 years ago
ELF	12016f1b34	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
ELF	679acf6cf1	修改分包	5 years ago
chenxiaojun	c81abece71	推广后台->财务管理->结算明细--更新	5 years ago
jbrazz	0dcb2a2014	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
jbrazz	c9996e071c	fix grand_id	5 years ago
ELF	09672d13b4	修改分包bug	5 years ago
ELF	e853fc1c3e	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
ELF	c6627a53c2	将plist demo写入php文件	5 years ago
chenxiaojun	a29015937a	推广后台->财务管理->提现记录->结算单--更新	5 years ago
chenzhi	58db110844	合并	5 years ago
chenzhi	115bafc067	新增补链日期及取消补链功能	5 years ago
chenxiaojun	e1fd669aa8	推广后台->财务管理->提现记录->结算单--新增	5 years ago
“用lww	0d83da8446	手机官网->首页->解决首页底部菜单由于引入bootstrap导致和其他页面不一致	5 years ago
ELF	bcc4b10bd6	落地页/下载页添加旧版兼容及链接黑名单	5 years ago
ELF	831456b333	解决冲突	5 years ago
chenxiaojun	258d1fbc1a	推广后台->安全密码|财务管理--调整	5 years ago
ELF	50c17baf8e	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
ELF	2beec440db	修改bug	5 years ago
ELF	327bf6cd87	修改配置	5 years ago
ELF	edc6a7be73	修改冲突	5 years ago
ELF	9abb4ebb2c	修改	5 years ago
chenzhi	7e37f3a2df	优化迁移用户addshifttask	5 years ago
jbrazz	9300280f78	merge feture/ylw	5 years ago
jbrazz	2dd1372b78	upt	5 years ago
jbrazz	db1ea1370a	upt	5 years ago
jbrazz	5e9cfb023f	uypt	5 years ago
Your Name	f642fb2c90	游戏充值订单添加CP订单号字段	5 years ago
jbrazz	74be3407b1	upt	5 years ago
“用lww	cb76357dae	Merge branch 'dev' into dev_lww	5 years ago
ELF	a8bc52df33	修改	5 years ago
“用lww	6d5bb2a9a1	手机官网-底部菜单高亮bug修复	5 years ago
ELF	65866d7fa1	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
ELF	6f1e4551ac	修改bug	5 years ago
zyx	cbfb286d53	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
zyx	5f673b346d	月结统计添加部长渠道	5 years ago
Your Name	b54f73e4c2	OA获取信息	5 years ago
Your Name	31e90a9dee	OA获取信息	5 years ago
Your Name	f9eac7138f	OA获取信息	5 years ago
ELF	e0d542b5f6	解决冲突	5 years ago
“用lww	63d99584ed	Merge branch 'dev' into dev_lww	5 years ago
ELF	eb15fc7dfc	Merge branch 'feature/pack' into feature/promote	5 years ago
ELF	2f4cd4c101	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
ELF	f056143dee	修改bug	5 years ago
chenzhi	9a6c75b41d	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
chenzhi	a653b46f0e	优化月份统计接口新增事务	5 years ago
jbrazz	8a2c99681a	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
chenzhi	c2e686c38e	123	5 years ago
chenzhi	537ed0857a	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
chenzhi	9d09fa4665	4角色聚合	5 years ago
Your Name	90105716d5	OA获取信息修改	5 years ago
Your Name	93bbc57ef2	OA获取信息修改	5 years ago
Your Name	94480951cb	OA获取信息修改	5 years ago
“用lww	631a635dfe	还原新版本	5 years ago
“用lww	4edd0bac4a	修改	5 years ago
zyx	5eca14b69e	Merge branches 'dev' and 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
zyx	9e9d742275	导出添加引号	5 years ago
zhengchanglong	943564f82d	Merge branch 'dev_zyx' into dev	5 years ago
zyx	d5a90238ec	导出加大默认内存	5 years ago
chenxiaojun	02d862cb7a	推广后台->安全密码--样式调整	5 years ago
jbrazz	c66c35b686	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
jbrazz	68df391d9c	upt	5 years ago
ELF	d79da20c28	Merge branch 'hotfix/media' into dev	5 years ago
ELF	3d88a82794	回滚官网	5 years ago
zhengchanglong	0223ecb125	Merge branch 'dev_zyx' into dev	5 years ago
zyx	35e1b2631a	导出添加游戏订单号	5 years ago
zhengchanglong	945ea1173a	Merge branch 'dev_zyx' into dev	5 years ago
zyx	a307bf343e	游戏详情查看导出，按日期分成多个sheet	5 years ago
ELF	1e1eb99b85	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
ELF	387e019db7	删除无用代码	5 years ago
“用lww	322aed6379	官网-游戏详情	5 years ago
“用lww	fb99dc3389	官网	5 years ago
chenxiaojun	3f7fd8c3c7	推广后台->结算明细|分成比例--样式调整	5 years ago
zhengchanglong	4dd2ab92f3	Merge branch 'dev_lww' of 47.111.118.107:/srv/git/platform into dev	5 years ago
“用lww	320ebf1b6e	新增分支dev_lww	5 years ago
zhengchanglong	2d67812f90	Merge branch 'dev_zyx' into dev	5 years ago
zyx	7e4aaf0a2e	Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx	5 years ago
zyx	266202c06b	游戏详情查看导出，按日期分成多个sheet	5 years ago
Your Name	330216e20e	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
Your Name	51701a485d	SDK菜单添加平台选型	5 years ago
ELF	38c2efdd08	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
ELF	08774a0954	完善添加推广员	5 years ago
“用lww	bde48df713	官网-商务合作	5 years ago
chenxiaojun	0cd7206f24	推广后台->数据管理->每日概况--bug修复	5 years ago
chenxiaojun	9b65745ee5	推广后台->验证安全密码--更新	5 years ago
chenxiaojun	265aa20a60	推广后台->验证安全密码--更新	5 years ago
chenxiaojun	b731b827e1	推广后台->验证安全密码--更新	5 years ago
chenxiaojun	43eaaf67c6	推广后台->验证安全密码--更新	5 years ago
chenxiaojun	f5d6bd27ab	推广后台->验证安全密码--更新	5 years ago
chenxiaojun	03cbc66d92	推广后台->验证安全密码--更新	5 years ago
chenxiaojun	1561e71977	推广后台->验证安全密码--更新	5 years ago
zyx	602e53e82f	合并分支dev_zyx财务部分的代码	5 years ago
chenxiaojun	8ae754f74a	推广后台->财务管理->结算明细--更新	5 years ago
ELF	71feea26fb	修改bug	5 years ago
ELF	89b243930d	落地页下载页优化	5 years ago
zhengchanglong	561b183bec	Merge branch 'dev_zyx' into dev	5 years ago
chenzhi	a9bc64a4b2	优化统计逻辑	5 years ago
zhengchanglong	78e23d19b2	Merge branch 'dev_zyx' into dev	5 years ago
zyx	8fd435a324	月结统计，游戏查看名称修改	5 years ago
chenxiaojun	a32565e2e1	推广后台->数据管理->数据汇总|每日概况--更新	5 years ago
chenxiaojun	7220247ecd	推广后台->数据管理->数据汇总|每日概况--更新	5 years ago
zhengchanglong	e5c834e054	Merge branch 'dev_zyx' into dev	5 years ago
zyx	4dfec50ba5	月结统计修改	5 years ago
chenxiaojun	43603cf493	推广后台->数据管理->数据汇总--更新	5 years ago
chenzhi	0ae24bf2cd	优化财务聚合接口2	5 years ago
chenzhi	58c405e914	优化财务聚合接口	5 years ago
ELF	c3502c6120	打包添加ios13兼容	5 years ago
chenzhi	0df9045e67	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
chenzhi	f54305911c	优化api暂存	5 years ago
chenxiaojun	3e2d027910	推广后台->财务管理->结算明细--更新	5 years ago
chenxiaojun	fba89ccb48	推广后台->财务管理->结算明细--更新	5 years ago
chenxiaojun	1d6ce31515	推广后台->财务管理->结算明细--更新	5 years ago
chenxiaojun	30aff2bd38	推广后台->财务管理->新增->结算明细	5 years ago
ELF	dbf113d9d4	修改bug	5 years ago
ELF	6c6b3b54aa	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
ELF	7547e867bb	三级变四级修改	5 years ago
ELF	fc89281a48	3级变4级修改	5 years ago
chenzhi	eacdea6f9b	暂存修改	5 years ago
chenzhi	a9b7b22a4b	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
chenzhi	81192f36c8	xiufu	5 years ago
sunke	372ec046d0	安全中心	5 years ago
zyx	3d8ed52daf	推广后台首页条件修改	5 years ago
chenzhi	6c45b4dd3f	修改获取下级函数	5 years ago
ELF	ae44fc79bd	修改	5 years ago
zhengchanglong	879accf9f5	Merge branch 'dev_zyx' into dev	5 years ago
zyx	f44a11a915	月结统计提示语修改	5 years ago
chenzhi	2a7d4a435c	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
chenzhi	18be299b4c	同步dev	5 years ago
zhengchanglong	78846c699f	Merge branch 'dev_zyx' into dev	5 years ago
zyx	9539b38e86	月结统计提示语修改	5 years ago
jbrazz	48b1cdf66f	upt	5 years ago
zhengchanglong	3c3a13c068	Merge branch 'dev_zyx' into dev	5 years ago
zyx	f0559c3576	Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx ... Conflicts: Application/Admin/View/Finance/index.html	5 years ago
zyx	cfa33d3e42	月结统计提示语修改	5 years ago
jbrazz	a8125bf377	upt	5 years ago
zhengchanglong	9dd5a34bf7	Merge branch 'dev_zyx' into dev	5 years ago
zyx	a850cfa048	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
chenzhi	50c775a78b	Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx	5 years ago
zyx	71b2287647	测试资源日志管理修改	5 years ago
chenzhi	f9397efebf	修改总流水统计方式	5 years ago
chenxiaojun	b6a62e2df1	推广后台->数据管理->每日概况 -- 更新	5 years ago
zhengchanglong	6dcd1549d0	Merge branch 'dev_zyx' into dev ... # Conflicts: # Data/update.sql	5 years ago
zyx	5a7432ef40	月结统计新增平台比收入字段，将平台币流水改为平台币支出	5 years ago
chenzhi	c8da11a12e	新增平台币流水充值	5 years ago
chenxiaojun	81ed43afdd	推广后台->数据管理->每日概况|数据汇总 -- 更新	5 years ago
zyx	b6080180ab	测试资源bug修正	5 years ago
chenzhi	b4c9f60ac9	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
elf@home	fc1cef9ec1	修改落地页/下载页	5 years ago
ELF	b4168a23f1	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
ELF	edc40b8a1b	ss	5 years ago
chenzhi	8212b4ecaf	4级推广申请资源修正	5 years ago
chenzhi	498de9ab75	同步dev	5 years ago
chenzhi	ab2252375d	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
chenzhi	c8fb1bb207	修改	5 years ago
chenxiaojun	681c401686	推广后台->数据管理->每日概况|数据汇总 -- 更新	5 years ago
chenxiaojun	42d330bbc4	推广后台->数据管理->每日概况|数据汇总 -- 更新	5 years ago
chenxiaojun	b1b10645fc	推广后台->数据管理->每日概况|数据汇总 -- 更新	5 years ago
ELF	689cc08b69	修改	5 years ago
zhengchanglong	5b93736468	Merge branch 'dev_zyx' into dev	5 years ago
zyx	1201180f79	游戏到处删除玩家昵称栏位	5 years ago
sunke	8633efd7d6	增加部门长分级	5 years ago
jbrazz	48de85a3c3	upt	5 years ago
chenzhi	02535dee01	dev	5 years ago
chenzhi	5b40ebdf91	dev	5 years ago
zhengchanglong	2c80186025	Merge branch 'dev_zyx' into dev	5 years ago
zyx	fcbf41fa65	Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx	5 years ago
zyx	27e8a0c0b5	提示栏文字调整,组长渠道与推广员渠道添加文字提示栏	5 years ago
chenzhi	dcc5939692	Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx	5 years ago
chenzhi	b4b4e7bc00	新增强制重新更新	5 years ago
zyx	a97ce09429	Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx	5 years ago
zyx	414f471ac1	提示栏文字调整	5 years ago
zhengchanglong	bf24f74d00	Merge branch 'dev_zyx' into dev	5 years ago
chenzhi	c547d43330	Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx	5 years ago
chenzhi	d91a44184f	优化数据更新提示	5 years ago
zyx	7167366949	提示栏文字调整	5 years ago
zyx	064a3d0098	搜索框样式调整	5 years ago
zyx	6f77f576d1	标签位置调整	5 years ago
zyx	bbc75a419d	bug修正，样式更新	5 years ago
zhengchanglong	fd97ecf494	Merge branch 'dev_zyx' into dev	5 years ago
chenzhi	fa29554923	肯定没错	5 years ago
zhengchanglong	d554815d12	Merge branch 'dev_zyx' into dev	5 years ago
chenzhi	a1f22ad756	Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx	5 years ago
chenzhi	2e4067e1de	测试	5 years ago
zhengchanglong	3da91ecb0f	Merge branch 'dev_zyx' into dev	5 years ago
zyx	e8fc252599	组长统计搜索bug修正	5 years ago
zhengchanglong	cd70dd7dd8	Merge branch 'dev_zyx' into dev	5 years ago
zyx	62311eb40d	月结统计bug修正	5 years ago
zyx	515ffa25b9	月结统计bug修正	5 years ago
chenzhi	3983a086ac	优化生成数据	5 years ago
chenzhi	8796458ead	聚合新增月份	5 years ago
chenxiaojun	381a2e0a67	推广后台->数据管理->每日概况|数据汇总 -- 更新	5 years ago
chenxiaojun	bf7c353692	推广后台->数据管理->每日概况|数据汇总 -- 更新	5 years ago
ELF	00966dc9e4	修改	5 years ago
Your Name	dce059abe5	SDK菜单修改	5 years ago
Your Name	7466b90d13	SDK菜单修改	5 years ago
Your Name	ed3ce2b4b5	SDK菜单修改	5 years ago
Your Name	c3762b420c	SDK菜单修改	5 years ago
Your Name	2569850407	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
Your Name	c90c397dd9	SDK菜单修改	5 years ago
chenzhi	af05f08689	Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx	5 years ago
chenzhi	4f7077a3ec	10311331	5 years ago
ELF	22dcca566b	修改	5 years ago
zyx	f16bf0b606	月结统计筛选列表逻辑修正	5 years ago
zyx	2adc07ec4a	组长月结统计页面文字修正	5 years ago
zyx	4803bd4a1b	组长月结统计页面修正	5 years ago
chenxiaojun	a14b18f54f	推广后台->数据管理->每日概况|数据汇总 -- 更新	5 years ago
zhengchanglong	e69bc5f459	Merge branch 'dev_zyx' into dev	5 years ago
zyx	63dff98660	月结统计导出bug修正	5 years ago
zyx	1d59721ee2	月结统计导出bug修正	5 years ago
zyx	b42f621dbc	财务管理功能提交	5 years ago
zyx	da1686fe14	Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx	5 years ago
zyx	ee5dccfaeb	财务管理功能代码完善	5 years ago
jbrazz	b78c6228b0	Merge branch 'hotfix/fix_bug' into dev	5 years ago
jbrazz	d4c7727426	upt	5 years ago
sunke	9844d5a740	订单查询	5 years ago
sunke	f15c6e68eb	注册明细，订单查询 修改等级结构	5 years ago
chenzhi	185f0ca30e	优化强制更新	5 years ago
chenzhi	2983f5b93f	新增强制更新某月份	5 years ago
chenzhi	e0857168f8	优化接口终结	5 years ago
chenzhi	cce64d646b	1	5 years ago
zyx	82323a7138	Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx	5 years ago
zyx	54a01da982	财务管理功能完善	5 years ago
chenzhi	483ccdffa2	Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx	5 years ago
chenzhi	4cf967fbcd	优化数据获取	5 years ago
zyx	fe8a60093f	新增渠道模板提交	5 years ago
zyx	d3de669837	'代码合并'	5 years ago
jbrazz	8859c847f6	upt	5 years ago
chenxiaojun	750a6dc596	推广后台->数据管理->每日概况|数据汇总 -- 更新	5 years ago
chenxiaojun	fffbdb739b	推广后台->数据管理->每日概况|数据汇总 -- 更新	5 years ago
ELF	6d68ddfe07	Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote	5 years ago
ELF	3abbe94774	修改bug	5 years ago
jbrazz	459b722c1c	upt	5 years ago
zhengchanglong	5c8573df37	修改月份列表	5 years ago
chenxiaojun	9c1eeb2448	推广后台->游戏管理->专服管理|混服管理 -- 更新	5 years ago
chenzhi	06395bcb9d	123	5 years ago
chenzhi	3b70468942	Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx	5 years ago
chenzhi	9803b418b9	优化统计	5 years ago
ELF	5b62b99765	三级变四级	5 years ago
chenxiaojun	49daffbbe4	推广后台->数据管理->每日概况|数据汇总->合计更新	5 years ago
chenxiaojun	9169a2084b	推广后台->数据管理->每日概况|数据汇总->合计更新	5 years ago
chenxiaojun	3be42d0186	管理后台->统计->新增->其他注册统计|官方渠道统计	5 years ago
chenxiaojun	e247c7dedf	管理后台->统计->新增->其他注册统计|官方渠道统计	5 years ago
zyx	24cdd7086b	'合并代码'	5 years ago
chenzhi	b41fbb05b7	123	5 years ago
sunke	021673f657	图片上传补充	5 years ago
chenzhi	50efce9315	更新spen root	5 years ago
chenzhi	f6f47748bc	优化时间戳	5 years ago
chenxiaojun	28969fd024	管理后台->游戏管理->合作方管理->批量删除更新	5 years ago
chenxiaojun	19f10c574d	管理后台->游戏管理->合作方管理->批量删除更新	5 years ago
chenzhi	b3f2069e94	Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx	5 years ago
chenzhi	d273c5af27	spendAPI优化	5 years ago
sunke	692a1bcc11	webuploader插件	5 years ago
zyx	c65aa8d69a	财务管理bug修正，导出功能，合作方列表添加	5 years ago
zyx	224c745ba8	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx	5 years ago
zyx	b39efb2d18	同步代码	5 years ago
chenzhi	1783cb0b71	恢复	5 years ago
chenzhi	28e15792e4	123	5 years ago
chenzhi	d708a6302f	123	5 years ago
zyx	abeb6acde9	git测试	5 years ago
zyx	2c4e20911e	Merge remote-tracking branch 'origin/dev_zyx' into dev_zyx ... # Conflicts: # Application/Admin/Controller/FinanceController.class.php	5 years ago
zyx	882041495e	git测试	5 years ago
chenzhi	bee4544f70	Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx	5 years ago
chenzhi	c2c92b4c95	xiuag	5 years ago
zyx	bedd841eda	财务管理功能添加	5 years ago
zyx	81c137a1bc	财务管理功能添加	5 years ago
chenzhi	3d38e78160	123	5 years ago
zyx	112316c395	财务管理功能添加	5 years ago
chenzhi	39a593b720	spend统计	5 years ago
chenxiaojun	20c8165888	管理后台->游戏管理->合作方管理->批量删除bug修改	5 years ago
chenxiaojun	0963c69f4d	管理后台->游戏管理->合作方管理->新增批量删除	5 years ago
chenxiaojun	41d45995b0	管理后台->游戏管理->合作方管理更新	5 years ago
chenxiaojun	dd10535a07	管理后台->游戏管理->新增合作方管理	5 years ago
chenzhi	b968702009	平台币	5 years ago
chenzhi	aae3f73e38	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz	5 years ago
chenzhi	a3d0c81d4b	修改	5 years ago
chenzhi	02151093af	修改	5 years ago
chenzhi	f5ac904a49	优化扶持	5 years ago
zyx	d7c9744872	扶持号时间格式修改	5 years ago
zyx	ae9a01f325	管理后台代码回滚	5 years ago
zyx	8b4bb3baab	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
zyx	1ce876c39f	管理后台测试资源bug修正	5 years ago
chenxiaojun	fbe8a764f1	管理后台->删除溪谷入口	5 years ago
chenxiaojun	a04f291471	管理后台->删除溪谷入口	5 years ago
zyx	96effb3525	管理后台测试资源bug修正	5 years ago
zyx	5c435bad74	公用文件添加排序	5 years ago
zyx	ecc93af47c	测试资源排序添加	5 years ago
ELF	6e1a768721	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
ELF	e4f1ed99f8	修改后台登录页	5 years ago
Your Name	6cb3a9ad75	SDK菜单	5 years ago
Your Name	c1a9c3918e	SDK菜单	5 years ago
chenxiaojun	032e5de877	推广平台->注册明细->bug修复	5 years ago
chenxiaojun	8b2e384fb6	推广平台->注册明细->bug修复	5 years ago
zyx	7e37560efe	公告计数负数问题改正	5 years ago
zyx	56deca114f	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
zyx	2f2158dbe0	详情页公告提示修正	5 years ago
chenxiaojun	1ec9c156cf	推广平台->数据汇总|每日概况->bug修复	5 years ago
chenxiaojun	27665e5b14	推广平台->数据汇总|每日概况->bug修复	5 years ago
ELF	6df44afb16	功能隐藏	5 years ago
zyx	b0411e3704	详情页公告提示修正	5 years ago
zyx	0ffbc8aff9	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
zyx	048e37fdd7	详情页公告提示修正	5 years ago
ELF	437909d53a	测试	5 years ago
chenxiaojun	37188cb085	推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整	5 years ago
chenxiaojun	36b9b51817	推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整	5 years ago
zyx	95731bba09	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
zyx	387f729773	首页公告提示修正	5 years ago
ELF	674dcc9e55	Merge branch 'hotfix/pc' into dev	5 years ago
ELF	390974a557	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
ELF	4917458099	Merge branch 'hotfix/query' into dev	5 years ago
ELF	c6a52282d5	修改bug	5 years ago
zyx	5637b496e9	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago
zyx	36de2e17c5	扶持号js逻辑修正	5 years ago
zhengchanglong	954928b7f2	推广员首页优化	5 years ago
zyx	31039bdeab	Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev	5 years ago