Merge branch 'master' of http://gitlab.scsmile.cn/zxf/sample-form-platform

sample-form-manager/src/main/java/com/mortals/xhx/base/system/upload/service/impl/UploadServiceImpl.java

@@ -50,7 +50,7 @@ public class UploadServiceImpl implements UploadService {
             throw new AppException("没有要上传的文件！");
         }
         if(StringUtils.isEmpty(prePath)){
-            prePath = "file/uploadfile";
+            prePath = "file/fileupload";
         }
         String fileName = tempFile.getOriginalFilename();
         String extension = FilenameUtils.getExtension(fileName);

sample-form-manager/src/main/java/com/mortals/xhx/base/system/upload/web/UploadController.java

@@ -55,7 +55,7 @@ public class UploadController extends BaseController {
 
 
     @RequestMapping(value = "commonupload")
-    public String doFileUpload(MultipartFile file, @RequestParam(value = "prePath",defaultValue = "file/uploadfile") String prePath) {
+    public String doFileUpload(MultipartFile file, @RequestParam(value = "prePath",defaultValue = "file/fileupload") String prePath) {
         Map<String, Object> model = new HashMap<>();
         String jsonStr = "";
         try {

sample-form-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java

@@ -46,7 +46,7 @@ public class DeviceServiceImpl extends AbstractCRUDServiceImpl<DeviceDao, Device
         DevicePdu devicePdu = new DevicePdu();
         BeanUtils.copyProperties(entity, devicePdu, BeanUtil.getNullPropertyNames(entity));
 
-        String productName = GlobalSysInfo.getParamValue(Constant.PARAMS_PRODUCT_NAME, "数字样表机");
+        String productName = GlobalSysInfo.getParamValue(Constant.PARAMS_PRODUCT_NAME, "样表机");
         devicePdu.setProductName(productName);
 
         Rest<RespData<List<DevicePdu>>> rest = deviceFeign.list(devicePdu);