Merge branch 'dsc' into 'develop'

测试服务器版本

See merge request 8timerv2/8timerapiv200!28

src/main/java/cn/timer/api/controller/dzht/DzhtController.java

@@ -678,13 +678,18 @@ public class DzhtController {
 	}
 	}
 
 
 	@GetMapping("/queryName")
 	@GetMapping("/queryName")
-	@ApiOperation(value = "查员工名字", httpMethod = "GET", notes = "接口发布说明")
+	@ApiOperation(value = "查版本名字", httpMethod = "GET", notes = "接口发布说明")
 	public Result<Object> getName(@RequestParam String empNum) {
 	public Result<Object> getName(@RequestParam String empNum) {
-		System.err.println(System.getProperty("os.name"));
-		System.err.println(System.getProperty("os.arch"));
-		System.err.println(System.getProperty("os.version"));
-		return ResultUtil.data(YgglMainEmp.builder().build()
-				.selectOne(new QueryWrapper<YgglMainEmp>().eq("emp_num", empNum)).getName());
+		String a = System.getProperty("os.name");
+		String b = System.getProperty("os.arch");
+		String c = System.getProperty("os.version");
+		Map<String, String> map = new HashMap<>();
+		map.put("os.name", a);
+		map.put("os.arch", b);
+		map.put("os.version", c);
+		return ResultUtil.data(map);
+//		return ResultUtil.data(YgglMainEmp.builder().build()
+//				.selectOne(new QueryWrapper<YgglMainEmp>().eq("emp_num", empNum)).getName());
 	}
 	}
 
 
 	/*************************** 设置请求头 ***************************************/
 	/*************************** 设置请求头 ***************************************/