Browse Source

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

syh 4 years ago
parent
commit
98e362991a

+ 10 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/VideoWatermarkTemplateController.java

@@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletRequest;
 @RestController
 @RequestMapping("/ctop/videoWatermarkTemplate")
 public class VideoWatermarkTemplateController {
+
 	@Autowired
 	private ITencentWatermarkTemplateService tencentWatermarkTemplateService;
 
@@ -57,4 +58,12 @@ public class VideoWatermarkTemplateController {
 		return result;
 	}
 
-}
+	@GetMapping(value= "/queryById")
+	public Result<TencentWatermarkTemplate> queryById(){
+		Result<TencentWatermarkTemplate> result = new Result<>();
+		TencentWatermarkTemplate tencentWatermarkTemplate=tencentWatermarkTemplateService.getById(5);
+		result.setSuccess(true);
+		result.setResult(tencentWatermarkTemplate);
+		return result;
+	}
+ }