Merge remote-tracking branch 'origin/develop' into develop

@@ -57,9 +57,9 @@
                 icon: 3
                 icon: 3
             }, function () {
             }, function () {
                 var targetUrl = 'dueDiligence';
                 var targetUrl = 'dueDiligence';
-                var dueDiligenceBasicInformationVO = $("#form1").serializeJson();
+                var dueDiligenceSurveyAddressVO = $("#dueDiligenceSurveyAddressVO").serializeJson();
                 var data = {
                 var data = {
-                    dueDiligenceBasicInformationVO: dueDiligenceBasicInformationVO
+                    dueDiligenceSurveyAddressVO: dueDiligenceSurveyAddressVO
                 };
                 };
                 $.ajax({
                 $.ajax({
                     type: 'post',
                     type: 'post',

@@ -310,26 +310,28 @@
     </div>
     </div>
 </div>
 </div>
 
 
+<form id="dueDiligenceSurveyAddressVO">
+    <input type="hidden" name="orderId" value="<?=$id?>">
 <div class="panel panel-default mb-20">
 <div class="panel panel-default mb-20">
     <div class="panel-header">住址考察</div>
     <div class="panel-header">住址考察</div>
     <div class="panel-body">
     <div class="panel-body">
         <div class="row cl">
         <div class="row cl">
-            <div class="form-group col-sm-3 col-md-1">
+            <div class="form-group col-sm-3 col-md-2">
                 <label>住址是否属实</label>
                 <label>住址是否属实</label>
                 <span class="form-control select-box">
                 <span class="form-control select-box">
-                    <select class="select" size="1">
-                        <option value="">属实</option>
-                        <option value="">不属实</option>
+                    <select class="select" name="addressHasReal" size="1">
+                        <option value="1">属实</option>
+                        <option value="0">不属实</option>
                     </select>
                     </select>
                 </span>
                 </span>
             </div>
             </div>
-            <div class="form-group col-sm-3 col-md-1">
+            <div class="form-group col-sm-3 col-md-2">
                 <label>居住环境</label>
                 <label>居住环境</label>
                 <span class="form-control select-box">
                 <span class="form-control select-box">
-                    <select class="select" size="1">
-                        <option value="">良好</option>
-                        <option value="">一般</option>
-                        <option value="">较差</option>
+                    <select class="select" name="dwellingEnvironment" size="1">
+                        <option value="0">良好</option>
+                        <option value="1">一般</option>
+                        <option value="2">较差</option>
                     </select>
                     </select>
                 </span>
                 </span>
             </div>
             </div>
@@ -338,16 +340,17 @@
         <div class="row cl">
         <div class="row cl">
             <div class="form-group has-feedback col-sm-3 col-md-1">
             <div class="form-group has-feedback col-sm-3 col-md-1">
                 <label>常住人口</label>
                 <label>常住人口</label>
-                <input type="text" class="form-control input-text" value="">
+                <input type="text" name="inhabitantNumber" class="form-control input-text" value="">
                 <span class="glyphicon form-control-feedback" aria-hidden="true">人</span>
                 <span class="glyphicon form-control-feedback" aria-hidden="true">人</span>
             </div>
             </div>
             <div class="form-group col-sm-6 col-md-4">
             <div class="form-group col-sm-6 col-md-4">
                 <label>&nbsp;</label>
                 <label>&nbsp;</label>
-                <input type="text" class="form-control input-text" value="">
+                <input type="text" class="form-control input-text" name="inhabitant" value="">
             </div>
             </div>
         </div>
         </div>
     </div>
     </div>
 </div>
 </div>
+</form>
 
 
 <div class="panel panel-default mb-20">
 <div class="panel panel-default mb-20">
     <div class="panel-header">综合评价</div>
     <div class="panel-header">综合评价</div>