From 2648880bec1583ce4fe1886de65300f0a22638d0 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 26 Sep 2022 17:09:31 +0800
Subject: [PATCH] 更改种类描述的判断方式、溯源时地图详情sql调整、农资出库时删除数据回滚修复、大屏接受数据增加展示判断

---
 src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java b/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java
index 28e582b..09966c9 100644
--- a/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java
+++ b/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java
@@ -71,6 +71,20 @@
 	}
 
 	/**
+	 * 小程序列表分页
+	 * @param traceability
+	 * @param query
+	 * @return
+	 */
+	@GetMapping("/xcxpage")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入traceability")
+	public R<IPage<TraceabilityVO>> xcxpage(TraceabilityVO traceability, Query query) {
+		IPage<TraceabilityVO> pages = traceabilityService.selectTraceabilityXcxPage(Condition.getPage(query), traceability);
+		return R.data(pages);
+	}
+
+	/**
 	 * 自定义查询，不分页
 	 * @param traceability
 	 * @return

--
Gitblit v1.9.3