Merge branch 'master' of http://120.46.222.128:10021/elink-star/epmet-cloud-yifengdian

epmet-module/pom.xml

@@ -44,7 +44,7 @@
 		<module>epmet-point</module>
 		<module>epmet-ext</module>
 		<module>data-aggregator</module>
-<!--        <module>open-data-worker</module>-->
+        <module>open-data-worker</module>
     </modules>
 
 </project>

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java

@@ -152,7 +152,7 @@ public class YiFengScreenController {
     }
 
     /**
-     * @Description: 种业咨询列表
+     * @Description: 种业咨询列表 弃用
      * @param :
      * @Return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData < com.epmet.resi.partymember.dto.IcSeedNewsDTO>>
      * @Author: lichao
@@ -165,6 +165,13 @@ public class YiFengScreenController {
         return new Result<PageData<IcSeedNewsDTO>>().ok(page);
     }
 
+    /**
+     * @Description: 种业咨询列表new
+     * @param :
+     * @Return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.resi.partymember.dto.IcSeedNewsDTO>>
+     * @Author: lichao
+     * @Date: 2024/3/28 16:55
+     */
     @GetMapping("seedNewsScreenList")
     public Result<List<IcSeedNewsDTO>> seedNewsScreenList(){
         List<IcSeedNewsDTO> result = icSeedNewsService.seedNewsScreenList();