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

@@ -7,7 +7,6 @@
             <span>资料清单</span>
         </div>
 
-        <form action="" id="form1">
         <input type="hidden" name="orderId" value="<?=$id?>">
         <div class="tabCon">
             <?php
@@ -18,7 +17,6 @@
                }
              ?>
         </div>
-        </form>
 
         <div class="tabCon">
             <?php $this->load->view('work/图片上传'); ?>