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

This commit is contained in:
牛叉闪闪
2024-07-30 15:14:32 +08:00

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, '')\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" +