Merge branch 'develop' of http://103.249.252.28:90/wangxiahui/zhny into develop

src/main/java/org/rcisoft/business/system/controller/SystemController.java

@@ -72,8 +72,9 @@ public class SystemController {
             @ApiImplicitParam(name = "proId", value = "项目主键", required = true, dataType = "字符串")
     })
     @RequestMapping("/selectDataByCache")
-    public Result selectDataByCache(@RequestParam String proId) {
-        return Result.builder(new PersistModel(1), MessageConstant.MESSAGE_ALERT_SUCCESS, MessageConstant.MESSAGE_ALERT_ERROR, systemServiceImpl.selectDataByCache(proId));
+    public String selectDataByCache(@RequestParam String proId) {
+        return systemServiceImpl.selectDataByCache(proId);
+//        return Result.builder(new PersistModel(1), MessageConstant.MESSAGE_ALERT_SUCCESS, MessageConstant.MESSAGE_ALERT_ERROR, systemServiceImpl.selectDataByCache(proId));
     }
 
     @ApiOperation(value="查询传感器code", notes="查询传感器code")