修改商品信息

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescController.java

@@ -74,10 +74,22 @@ public class GoodsDescController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入goodsDesc")
+		public R<IPage<GoodsDescVO>> list(GoodsDescVO goodsDesc, Query query) {
+			goodsDesc.setTenantId(SecureUtil.getTenantId());
+			goodsDesc.setIsDeleted(0);
+			IPage<GoodsDescVO> pages = goodsDescService.selectGoodsDescPage(Condition.getPage(query),goodsDesc);
+			return R.data(pages);
+		}
+
+
+	@GetMapping("/descList")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入goodsDesc")
 	public R<?> list(@RequestParam(name = "current", defaultValue = "1") Integer current,
 					 @RequestParam(name = "size", defaultValue = "10") Integer size,
 					 @RequestParam(name = "cname", required = false) String cname,
 					 @RequestParam(name = "code", required = false) String code
+
 					 )
 	{
 		LambdaQueryWrapper<GoodsDesc> goodsDescLambdaQueryWrapper=new LambdaQueryWrapper<>();
@@ -85,6 +97,7 @@ public class GoodsDescController extends BladeController {
 			.like(!StringUtils.isBlank(cname),GoodsDesc::getCname,cname)
 			.like(!StringUtils.isBlank(code),GoodsDesc::getCode,code)
 			.eq(GoodsDesc::getTenantId,AuthUtil.getTenantId())
+			.eq(GoodsDesc::getType,0)
 		    .orderByDesc(GoodsDesc::getCreateTime);
 		Page<GoodsDesc> page=new Page<>(current,size);
 		IPage<GoodsDesc> iPage=goodsDescService.page(page,goodsDescLambdaQueryWrapper);