1.解决冲突

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DimController.java

@@ -1,15 +1,20 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.AgencySubTreeDto;
 import com.epmet.service.StatsDimService;
+import com.epmet.service.stats.DimAgencyService;
 import com.epmet.service.stats.DimDateService;
 import com.epmet.service.stats.DimMonthService;
-import oracle.jdbc.proxy.annotation.Post;
+import com.epmet.service.stats.DimQuarterService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("dim")
 public class DimController {