qy-platform/Public/static
zhengyongxing 4a5a6a90d0 Merge branches 'dev_permission' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_permission
 Conflicts:
	Data/update.sql
..
bootstrap initial
datetimepicker initial
flatpickr 添加功能
icons_alibaba 推广平台->数据汇总->充值玩家--更新
ios9 initial
jquery-ui initial
jqueryselect initial
kindeditor initial
layer 修改批量锁定问题
layer3 修改批量锁定问题
layer_mobile initial
layui initial
layui-v2.5.5 数据管理功能提交
pc_no_show initial
provincecityarea initial
qiniu initial
qtip initial
stat initial
thinkbox initial
thinkeditor initial
ueditor initial
uploadify initial
vide7.4.1 推广平台>落地页--更新
wap_no_show initial
webuploader webuploader插件
xheditor initial
zeroclipboard initial
bank.js initial
bootstrap.min.css initial
clipboard.min.js 落地页下载页优化
isCardID.js initial
jquery-1.10.2.min.js initial
jquery-2.0.3.min.js initial
jquery-migrate-1.2.1.min.js initial
jquery.cookie.js initial
jquery.cookies.2.2.0.min.js initial
jquery.dragsort-0.5.1.min.js initial
jquery.form.js initial
jquery.validate.min.js initial
juicer-min.js 优化补链记录为ajax
mail_suffix.js initial
md5.js initial
think.js initial
vue.js 修改bug