变更字段

# Conflicts:
#	src/main/java/com/seeyon/apps/src_leasebill/dao/impl/LeaseBillDaoImpl.java
#	v5/apps-customize/src/main/java/com/seeyon/apps/src_leasebill/controller/LeaseBillController.java
#	v5/apps-customize/src/main/java/com/seeyon/apps/src_leasebill/util/LeaseBillUtil.java

.idea/.gitignore

@@ -1,5 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Environment-dependent path to Maven home directory
-/mavenHomeManager.xml

src/main/webapp/apps_res/cap/customCtrlResources/leaseBillResources/js/openUnflow.js

@@ -81,19 +81,20 @@
 									if(targetObj[key].display === "年缴费方案选项") {
 										njiaofeifs = targetObj[key].showValue
 									}
-									if(targetObj[key].display === "租赁单价") {
+									if(targetObj[key].display === "实租单价") {
 										mjzj = targetObj[key].showValue
 									}
 									if(targetObj[key].display === "固定租金标准") {
 										gdzj = targetObj[key].showValue
 									}
-									if(targetObj[key].display === "计租日期") {
+									if(targetObj[key].display === "合同开始日期") {
+									if(targetObj[key].display === "计租开始日期") {
 										startDate = targetObj[key].showValue
 									}
 									if(targetObj[key].display === "合同截止日期") {
 										endDate = targetObj[key].showValue
 									}
-									if(targetObj[key].display === "租赁面积") {
+									if(targetObj[key].display === "租赁总面积") {
 										mj = targetObj[key].showValue
 									}
 									if(targetObj[key].display === "账单编号") {