From 236ef1437170be16c99da4cffa39ffde54778f99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E6=A5=9A?= <823169880@qq.com>
Date: Tue, 15 Jan 2019 09:57:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/master' into
 hechu1

# Conflicts:
#	src/core/operation/Select.json
#	src/core/process/Process.java
---
 web/jsFile/upload_action.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/jsFile/upload_action.js b/web/jsFile/upload_action.js
index c3214c9..906fe1c 100644
--- a/web/jsFile/upload_action.js
+++ b/web/jsFile/upload_action.js
@@ -4,7 +4,7 @@ $(document).ready(function () {
   $(document).off('change',showMsg).on('change','.true-select',showMsg)
 })
 function sendFile() {
-  var fileData =new FormData;
+  var fileData =new FormData();
   var Url4='testfrom.jsp';
   var file=$('.true-select').files;
   if($('.true-select').val()=='')