Merge branch 'feature/contract_lease_report' into develop

# Conflicts:
#	src/main/webapp/modules/cont/CON3700/contract_overdue_report.lview

src/main/webapp/modules/cont/CON3700/contract_overdue_report.lview

@@ -32,7 +32,7 @@
             temp_date.setMonth(temp_date.getMonth() + 1);//再设置成下个月
 
             var  last_month_date=getNextDate(temp_date,-1);
-            
+
 
           //查询数据
             $(grid_ds_id).setQueryUrl("${/request/@context_path}/autocrud/cont.CON3700.contract_overdue_report/query");

src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview

@@ -298,7 +298,7 @@
 
             if (bp_tenant_detail_r && ds.id == prj_project_ds_id) {
                 for (var key in bp_tenant_detail_r.data) {
-                    if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age' &&  key != 'project_id') {
+                    if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age' &&  key != 'project_id'&& key != 'third_party_credibility' && key != 'third_party_credibility_n') {
                         if(!bp_tenant_detail_r.get(key)){
                             Leaf.showInfoMessage("提示","承租人评分信息区域的所有字段，除\"第三方信用度\"外，其他都为必输字段，请填写！");
                             bp_rate_flag = false;