Merge origin/master  修改了海涛和无忌冲突的部分
Merge origin/master

Conflicts:
	src/com/jskj/asset/client/panel/ckgl/MainPanel.form
	src/com/jskj/asset/client/panel/ckgl/MainPanel.java
	src/com/jskj/asset/client/panel/ckgl/resources/MainPanel.properties
	src/com/jskj/asset/client/panel/ckgl/resources/SelectYiMiaoChuRuKu.properties
	src/com/jskj/asset/client/panel/ckgl/resources/YiMiaoBaoSun.properties
	src/com/jskj/asset/client/panel/slgl/GuDingZiChanCaiGouShenQingJDialog.form
	src/com/jskj/asset/client/panel/slgl/GuDingZiChanCaiGouShenQingJDialog.java
	src/com/jskj/asset/client/panel/slgl/GuDingZiChanYanShouJDialog.form
	src/com/jskj/asset/client/panel/slgl/GuDingZiChanYanShouJDialog.java
	src/com/jskj/asset/client/panel/slgl/ITGuDingZiChanDengJiJDialog.form
	src/com/jskj/asset/client/panel/slgl/ITGuDingZiChanDengJiJDialog.java
	src/com/jskj/asset/client/panel/slgl/PTGuDingZiChanDengJiJDialog.java
	src/com/jskj/asset/client/panel/slgl/resources/GuDingZiChanCaiGouShenQingJDialog.properties