remove project file.

Signed-off-by: hwq830 <hwq830@gmail.com>
合并
删除工程文件
.
Merge branch 'master' of https://github.com/hwq830/GCDP

Conflicts:
	.classpath
	.gitignore
	.project
	.settings/.jsdtscope
	.settings/org.eclipse.core.resources.prefs
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.m2e.core.prefs
	.settings/org.eclipse.wst.common.component
	.settings/org.eclipse.wst.common.project.facet.core.xml
	src/main/webapp/data/template/form/template_1.ftl
	src/main/webapp/res/css/runTime-easyui.css
	src/main/webapp/res/js/config/commonUI4RT_cfg.js
	src/main/webapp/res/js/config/controlsUI_cfg.js
	src/main/webapp/res/js/designer_v2.0.js
	src/main/webapp/res/js/easyui/easyloader.js
	src/main/webapp/res/js/easyui/jquery.easyui.min.js
	src/main/webapp/res/js/easyui/locale/easyui-lang-af.js
	src/main/webapp/res/js/easyui/locale/easyui-lang-ar.js
	src/main/webapp/res/js/easyui/locale/easyui-lang-bg.js
	src/main/webapp/res/js/easyui/locale/easyui-lang-ca.js
	src/main/webapp/res/js/easyui/locale/easyui-lang-cs.js
	src/main/webapp/res/js/easyui/locale/easyui-lang-cz.js
	src/main/webapp/res/js/easyui/locale/easyui-lang-da.js
	src/main/webapp/res/js/easyui/locale/easyui-lang-de.js
	src/main/webapp/res/js/easyui/locale/easyui-lang-el.js
	src/main/webapp/res/js/easyui/locale/easyui-lang-en.js
	src/main/webapp/res/js/easyui/locale/easyui-lang-es.js
	src/main/webapp/res/js/easyui/locale/easyui-lang-fr.js
	src/main/webapp/res/js/easyui/locale/easyui-lang-jp.js
	src/main/webapp/res/js/easyui/locale/easyui-lang-nl.js
	src/main/webapp/res/js/easyui/locale/easyui-lang-pl.js
	src/main/webapp/res/js/easyui/locale/easyui-lang-pt_BR.js
	src/main/webapp/res/js/easyui/locale/easyui-lang-ru.js
	src/main/webapp/res/js/easyui/locale/easyui-lang-sv_SE.js
	src/main/webapp/res/js/easyui/locale/easyui-lang-zh_CN.js
	src/main/webapp/res/js/easyui/locale/easyui-lang-zh_TW.js
	src/main/webapp/res/js/easyui/plugins/jquery.accordion.js
	src/main/webapp/res/js/easyui/plugins/jquery.calendar.js
	src/main/webapp/res/js/easyui/plugins/jquery.combo.js
	src/main/webapp/res/js/easyui/plugins/jquery.combobox.js
	src/main/webapp/res/js/easyui/plugins/jquery.combogrid.js
	src/main/webapp/res/js/easyui/plugins/jquery.combotree.js
	src/main/webapp/res/js/easyui/plugins/jquery.datagrid.js
	src/main/webapp/res/js/easyui/plugins/jquery.datebox.js
	src/main/webapp/res/js/easyui/plugins/jquery.datetimebox.js
	src/main/webapp/res/js/easyui/plugins/jquery.dialog.js
	src/main/webapp/res/js/easyui/plugins/jquery.draggable.js
	src/main/webapp/res/js/easyui/plugins/jquery.droppable.js
	src/main/webapp/res/js/easyui/plugins/jquery.form.js
	src/main/webapp/res/js/easyui/plugins/jquery.layout.js
	src/main/webapp/res/js/easyui/plugins/jquery.linkbutton.js
	src/main/webapp/res/js/easyui/plugins/jquery.menu.js
	src/main/webapp/res/js/easyui/plugins/jquery.menubutton.js
	src/main/webapp/res/js/easyui/plugins/jquery.messager.js
	src/main/webapp/res/js/easyui/plugins/jquery.numberbox.js
	src/main/webapp/res/js/easyui/plugins/jquery.numberspinner.js
	src/main/webapp/res/js/easyui/plugins/jquery.pagination.js
	src/main/webapp/res/js/easyui/plugins/jquery.panel.js
	src/main/webapp/res/js/easyui/plugins/jquery.parser.js
	src/main/webapp/res/js/easyui/plugins/jquery.progressbar.js
	src/main/webapp/res/js/easyui/plugins/jquery.propertygrid.js
	src/main/webapp/res/js/easyui/plugins/jquery.resizable.js
	src/main/webapp/res/js/easyui/plugins/jquery.searchbox.js
	src/main/webapp/res/js/easyui/plugins/jquery.slider.js
	src/main/webapp/res/js/easyui/plugins/jquery.spinner.js
	src/main/webapp/res/js/easyui/plugins/jquery.splitbutton.js
	src/main/webapp/res/js/easyui/plugins/jquery.tabs.js
	src/main/webapp/res/js/easyui/plugins/jquery.timespinner.js
	src/main/webapp/res/js/easyui/plugins/jquery.tooltip.js
	src/main/webapp/res/js/easyui/plugins/jquery.tree.js
	src/main/webapp/res/js/easyui/plugins/jquery.treegrid.js
	src/main/webapp/res/js/easyui/plugins/jquery.validatebox.js
	src/main/webapp/res/js/easyui/plugins/jquery.window.js
	src/main/webapp/res/js/easyui/src/easyloader.js
	src/main/webapp/res/js/easyui/src/jquery.accordion.js
	src/main/webapp/res/js/easyui/src/jquery.calendar.js
	src/main/webapp/res/js/easyui/src/jquery.checkboxgroup.js
	src/main/webapp/res/js/easyui/src/jquery.combobox.js
	src/main/webapp/res/js/easyui/src/jquery.datebox.js
	src/main/webapp/res/js/easyui/src/jquery.draggable.js
	src/main/webapp/res/js/easyui/src/jquery.droppable.js
	src/main/webapp/res/js/easyui/src/jquery.form.js
	src/main/webapp/res/js/easyui/src/jquery.hidden.js
	src/main/webapp/res/js/easyui/src/jquery.linkbutton.js
	src/main/webapp/res/js/easyui/src/jquery.menu.js
	src/main/webapp/res/js/easyui/src/jquery.parser.js
	src/main/webapp/res/js/easyui/src/jquery.progressbar.js
	src/main/webapp/res/js/easyui/src/jquery.propertygrid.js
	src/main/webapp/res/js/easyui/src/jquery.radiogroup.js
	src/main/webapp/res/js/easyui/src/jquery.resizable.js
	src/main/webapp/res/js/easyui/src/jquery.slider.js
	src/main/webapp/res/js/easyui/src/jquery.tabs.js
	src/main/webapp/res/js/easyui/src/jquery.textarea.js
	src/main/webapp/res/js/easyui/src/jquery.textarea2.js
	src/main/webapp/res/js/easyui/src/jquery.textfield.js
	src/main/webapp/res/js/easyui/src/jquery.window.js
	src/main/webapp/res/js/easyui/themes/icon.css
	src/main/webapp/test/easyui-form-demo.html
.

Signed-off-by: huwq <huwq@ifeng.com>
.

Signed-off-by: huwq <huwq@ifeng.com>
Merge branch 'master' of https://github.com/hwq830/GCDP.git

Conflicts:
	src/main/webapp/data/template/form/template_1.ftl
	src/main/webapp/res/js/easyui/src/jquery.radiogroup.js
Merge branch 'master' of https://github.com/hwq830/GCDP.git

Conflicts:
	src/main/webapp/data/template/form/template_1.ftl
	src/main/webapp/res/css/runTime-easyui.css
	src/main/webapp/res/js/conflictMgr.js

Signed-off-by: huwq <huwq@ifeng.com>
Signed-off-by: huwq <huwq@ifeng.com>
.

Signed-off-by: huwq <huwq@ifeng.com>
配制文件改为线上

Signed-off-by: huwq <huwq@ifeng.com>
Merge branch 'master' of https://github.com/hwq830/GCDP.git
Bug修复

Signed-off-by: huwq <huwq@ifeng.com>