Initial commit
后台框架提交
Merge branch 'master' of https://github.com/xuchaobei/SCFRM.git
增加readme内容
增加环境说明
项目settings提交
前端框架+常规布控删除、查询功能
struts.xml ---增加了基础设置中的所需的action配置
package  --basicSettings  基础设置中的一些模块。
修改table 滚动条显示 为自动换行显示
footer高度自适应，增删改操作的结果格式获取方法
Merge branch 'master' of https://github.com/xuchaobei/SCFRM.git

Conflicts:
	WebContent/META-INF/context.xml
	WebContent/js/lib/jquery-1.10.1.min.js
	src/cn/gov/scciq/bussiness/example/HelloJsonAction.java
	src/struts.xml
遗漏dto及ConstantStr提交
Merge branch 'master' of https://github.com/xuchaobei/SCFRM.git

Conflicts:
	WebContent/html/ConventionCtrl.html
	WebContent/index.html
	WebContent/js/ConventionCtrl.js
	WebContent/js/index.js
	WebContent/js/lib/custom.js
	WebContent/login.html
	src/cn/gov/scciq/bussiness/searchSelect/SearchSelectAction.java
Merge branch 'master' of https://github.com/xuchaobei/SCFRM.git
常规布控完整功能
basicsetting 11-25
1、修改左边导航菜单选中时的状态，修改弹出div的样式。
2、应急布控列表获取
1128样式的修改
Merge branch 'master' of https://github.com/xuchaobei/SCFRM.git

Conflicts:
	WebContent/html/ConventionCtrl.html
	WebContent/index.html
	WebContent/js/ConventionCtrl.js
	WebContent/js/index.js
	WebContent/js/lib/custom.js
	src/cn/gov/scciq/bussiness/riskCtrl/ConventionCtrlAction.java
Merge branch 'master' of https://github.com/VecJunZhi/exam.git