货区是否为备货区修改货区类型

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java

@@ -76,13 +76,26 @@ public class BasicdataGoodsAreaController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入warehouseGoodsArea")
-	public R<IPage<BasicdataGoodsAreaVO>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataGoodsArea, Query query) {
+	public R<IPage<BasicdataGoodsAreaEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataGoodsArea, Query query) {
 		IPage<Object> page = Condition.getPage(query);
-		IPage<BasicdataGoodsAreaVO> list = basicdataGoodsAreaService.getBasicdataGoodsAreaList(basicdataGoodsArea,page);
+//		IPage<BasicdataGoodsAreaVO> list = basicdataGoodsAreaService.getBasicdataGoodsAreaList(basicdataGoodsArea,page);
-//		IPage<BasicdataGoodsAreaVO> pages = basicdataGoodsAreaService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataGoodsArea, BasicdataGoodsAreaEntity.class));
+		IPage<BasicdataGoodsAreaEntity> pages = basicdataGoodsAreaService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataGoodsArea, BasicdataGoodsAreaEntity.class));
-		return R.data(list);
+		return R.data(pages);
 	}
 
+//	/**
+//	 * 货区 分页
+//	 */
+//	@GetMapping("/list")
+//	@ApiOperationSupport(order = 2)
+//	@ApiOperation(value = "分页", notes = "传入warehouseGoodsArea")
+//	public R<IPage<BasicdataGoodsAreaEntity>> listInfo(@ApiIgnore Query query) {
+//		IPage<Object> page = Condition.getPage(query);
+////		IPage<BasicdataGoodsAreaVO> list = basicdataGoodsAreaService.getBasicdataGoodsAreaList(basicdataGoodsArea,page);
+//		IPage<BasicdataGoodsAreaEntity> pages = basicdataGoodsAreaService.page(Condition.getPage(query));
+//		return R.data(pages);
+//	}
+
 	/**
 	 * 货区 自定义分页
 	 */

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml

@@ -21,7 +21,7 @@
         <result column="warehouse_id" property="warehouseId"/>
         <result column="headline" property="headline"/>
         <result column="enbale_status" property="enableStatus"/>
-        <result column="is_strage_area" property="isStrageArea"/>
+        <result column="area_type" property="areaType"/>
     </resultMap>
     <update id="removeGoodsArea">
         UPDATE logpm_warehouse_goods_area