From 8eedf3b3ffee24b0d081123de7f09b399f0ef0f3 Mon Sep 17 00:00:00 2001 From: ll <1079863556@qq.com> Date: Thu, 31 Jul 2025 23:34:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BE=8A=E5=A5=B6=E5=87=BA=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dairyProducts/controller/NpMilkInOutStoreController.java | 1 + .../controller/NpSheepMilkAnalysisController.java | 1 + .../com/zhyc/module/dairyProducts/domain/NpMilkInOutStore.java | 2 +- .../zhyc/module/dairyProducts/domain/NpSheepMilkAnalysis.java | 1 + .../module/dairyProducts/mapper/NpMilkInOutStoreMapper.java | 1 + .../module/dairyProducts/mapper/NpSheepMilkAnalysisMapper.java | 2 +- .../module/dairyProducts/service/INpMilkInOutStoreService.java | 3 ++- .../dairyProducts/service/INpSheepMilkAnalysisService.java | 3 ++- .../service/impl/NpMilkInOutStoreServiceImpl.java | 1 + .../service/impl/NpSheepMilkAnalysisServiceImpl.java | 3 ++- .../resources/mapper/dairyProducts/NpMilkInOutStoreMapper.xml | 2 +- .../mapper/dairyProducts/NpSheepMilkAnalysisMapper.xml | 2 +- 12 files changed, 15 insertions(+), 7 deletions(-) diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpMilkInOutStoreController.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpMilkInOutStoreController.java index 09935a1..44cbccb 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpMilkInOutStoreController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpMilkInOutStoreController.java @@ -67,3 +67,4 @@ public class NpMilkInOutStoreController extends BaseController { return AjaxResult.success(service.getAllColumnOptions()); } } + diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpSheepMilkAnalysisController.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpSheepMilkAnalysisController.java index f000b87..0c2955d 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpSheepMilkAnalysisController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpSheepMilkAnalysisController.java @@ -76,3 +76,4 @@ public class NpSheepMilkAnalysisController extends BaseController { return util.exportExcel(list, "奶产量分析数据"); } } + diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpMilkInOutStore.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpMilkInOutStore.java index b7cf882..770ace1 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpMilkInOutStore.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpMilkInOutStore.java @@ -125,4 +125,4 @@ public class NpMilkInOutStore extends BaseEntity { public BigDecimal getReturnYogurt() { return returnYogurt; } public void setReturnYogurt(BigDecimal returnYogurt) { this.returnYogurt = returnYogurt; } -} \ No newline at end of file +} diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpSheepMilkAnalysis.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpSheepMilkAnalysis.java index c1b6bff..05972f6 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpSheepMilkAnalysis.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpSheepMilkAnalysis.java @@ -159,3 +159,4 @@ public class NpSheepMilkAnalysis { public Date getLastUpdate() { return lastUpdate; } public void setLastUpdate(Date lastUpdate) { this.lastUpdate = lastUpdate; } } + diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpMilkInOutStoreMapper.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpMilkInOutStoreMapper.java index b303256..aa4ed29 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpMilkInOutStoreMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpMilkInOutStoreMapper.java @@ -20,3 +20,4 @@ public interface NpMilkInOutStoreMapper { List selectFeedSources(); List selectSaleDestinations(); } + diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpSheepMilkAnalysisMapper.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpSheepMilkAnalysisMapper.java index 9d0aca7..f330707 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpSheepMilkAnalysisMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpSheepMilkAnalysisMapper.java @@ -16,4 +16,4 @@ public interface NpSheepMilkAnalysisMapper { int deleteNpSheepMilkAnalysisById(Long id); int deleteNpSheepMilkAnalysisByIds(Long[] ids); -} \ No newline at end of file +} diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpMilkInOutStoreService.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpMilkInOutStoreService.java index 6ec70b4..992573a 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpMilkInOutStoreService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpMilkInOutStoreService.java @@ -12,4 +12,5 @@ public interface INpMilkInOutStoreService { List> getAllColumnOptions(); List> parseImportExcel(MultipartFile file) throws Exception; void batchInsertFromRows(List> rows) throws Exception; -} \ No newline at end of file +} + diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpSheepMilkAnalysisService.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpSheepMilkAnalysisService.java index 419f679..7750a5f 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpSheepMilkAnalysisService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpSheepMilkAnalysisService.java @@ -16,4 +16,5 @@ public interface INpSheepMilkAnalysisService { int deleteNpSheepMilkAnalysisById(Long id); int deleteNpSheepMilkAnalysisByIds(Long[] ids); -} \ No newline at end of file +} + diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpMilkInOutStoreServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpMilkInOutStoreServiceImpl.java index 189c5f4..fc99d05 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpMilkInOutStoreServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpMilkInOutStoreServiceImpl.java @@ -79,3 +79,4 @@ public class NpMilkInOutStoreServiceImpl implements INpMilkInOutStoreService { } } } + diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpSheepMilkAnalysisServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpSheepMilkAnalysisServiceImpl.java index 9bded13..c2476ee 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpSheepMilkAnalysisServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpSheepMilkAnalysisServiceImpl.java @@ -43,4 +43,5 @@ public class NpSheepMilkAnalysisServiceImpl implements INpSheepMilkAnalysisServi public int deleteNpSheepMilkAnalysisByIds(Long[] ids) { return npSheepMilkAnalysisMapper.deleteNpSheepMilkAnalysisByIds(ids); } -} \ No newline at end of file +} + diff --git a/zhyc-module/src/main/resources/mapper/dairyProducts/NpMilkInOutStoreMapper.xml b/zhyc-module/src/main/resources/mapper/dairyProducts/NpMilkInOutStoreMapper.xml index 8fc6555..ea5eb4c 100644 --- a/zhyc-module/src/main/resources/mapper/dairyProducts/NpMilkInOutStoreMapper.xml +++ b/zhyc-module/src/main/resources/mapper/dairyProducts/NpMilkInOutStoreMapper.xml @@ -55,4 +55,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{amount}) - \ No newline at end of file + diff --git a/zhyc-module/src/main/resources/mapper/dairyProducts/NpSheepMilkAnalysisMapper.xml b/zhyc-module/src/main/resources/mapper/dairyProducts/NpSheepMilkAnalysisMapper.xml index 478eb8e..34e4ba2 100644 --- a/zhyc-module/src/main/resources/mapper/dairyProducts/NpSheepMilkAnalysisMapper.xml +++ b/zhyc-module/src/main/resources/mapper/dairyProducts/NpSheepMilkAnalysisMapper.xml @@ -149,4 +149,4 @@ - \ No newline at end of file +