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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
GYJ
2024-07-30 15:15:09 +08:00
parent 84802d508f 1b116ed8b7
commit b7ec560d11
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbHandoverController.java
View File

@@ -33,7 +33,7 @@ public class TbHandoverController {
tbHandoverService.download(tbHandoverService.queryAll(criteria), response); tbHandoverService.download(tbHandoverService.queryAll(criteria), response);
} }
@PostMapping @GetMapping
@Log("查询查询交班记录") @Log("查询查询交班记录")
@ApiOperation("查询查询交班记录") @ApiOperation("查询查询交班记录")
public ResponseEntity<Object> queryTbHandover(TbHandoverQueryCriteria criteria, Pageable pageable){ public ResponseEntity<Object> queryTbHandover(TbHandoverQueryCriteria criteria, Pageable pageable){

2
eladmin-system/src/main/java/cn/ysk/cashier/repository/order/StockCountRepository.java
View File

@@ -45,7 +45,7 @@ public interface StockCountRepository extends JpaRepository<StockCountDTO, Integ
"\n" + "\n" +
"WHEN pro.is_distribute = 0 THEN\n" + "WHEN pro.is_distribute = 0 THEN\n" +
"sku.stock_number ELSE pro.stock_number \n" + "sku.stock_number ELSE pro.stock_number \n" +
"END AS stock_number, ifnull(sku.spec_snap, '') specSnap\n" + "END AS stock_number, ifnull(sku.spec_snap, '') spec_snap\n" +
"FROM\n" + "FROM\n" +
"tb_order_detail info\n" + "tb_order_detail info\n" +
"LEFT JOIN tb_order_info orders ON orders.id = info.order_id\n" + "LEFT JOIN tb_order_info orders ON orders.id = info.order_id\n" +