czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ww' into test

This commit is contained in:
wangw 2024-10-08 16:28:57 +08:00
parent b20996355c 52656b40b9
commit e9de90557e
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductController.java
View File

@ -37,7 +37,7 @@ public class TbProductController {
@PostMapping("/list/v2") @PostMapping("/list/v2")
@ApiOperation("查询商品列表 新") @ApiOperation("查询商品列表 新")
public ResponseEntity<Object> queryTbProductV2(TbProductQueryV2Criteria criteria, Pageable pageable){ public ResponseEntity<Object> queryTbProductV2(@RequestBody TbProductQueryV2Criteria criteria, Pageable pageable){
return new ResponseEntity<>(tbProductService.queryAllV2(criteria,pageable),HttpStatus.OK); return new ResponseEntity<>(tbProductService.queryAllV2(criteria,pageable),HttpStatus.OK);
} }

19
eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductStockCountQueryCriteria.java
View File

@ -22,10 +22,21 @@ public class TbProductStockCountQueryCriteria extends BaseQueryDto {
private Integer size = 10; private Integer size = 10;
public String getProductName() { public void setProductId(String productId) {
if(StringUtils.isNotBlank(productName)){ if (StringUtils.isNotBlank(productId)) {
return productName; this.productId = productId;
}
}
public void setProductName(String productName) {
if (StringUtils.isNotBlank(productName)) {
this.productName = productName;
}
}
public void setCategoryId(String categoryId) {
if (StringUtils.isNotBlank(categoryId)) {
this.categoryId = categoryId;
} }
return null;
} }
} }