Merge branch 'feture-xkq' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into feture-xkq

# Conflicts: # YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/PlanVisual3dController.java

Merge branch 'feture-xkq' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into feture-xkq
239ad420 · suhuiguang · 2d394de4 · 239ad420
Commit 239ad420 authored Feb 21, 2020 by suhuiguang
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

PlanVisual3dController.java .../amos/fas/business/controller/PlanVisual3dController.java +0 -2

No files found.
--- a/YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/PlanVisual3dController.java
+++ b/YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/PlanVisual3dController.java
@@ -25,8 +25,6 @@ public class PlanVisual3dController extends BaseController {

    @Autowired
    private IPlanVisual3dService planVisual3dService;
-    @Autowired
-    private IDictService  dictService;

    @ApiOperation(value = "预案应用树", notes = "预案应用树")
    @GetMapping(value = "/plan/tree")