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

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/stock/controller/StockDescController.java

@@ -520,7 +520,7 @@ public class StockDescController extends BladeController {
 						} else {
 							lambdaQueryWrapper.in(PjStockDesc::getGoodsId, goodIds);
 						}
-						lambdaQueryWrapper.like(PjStockDesc::getCname, stockDesc.getCname());
+						// lambdaQueryWrapper.like(PjStockDesc::getCname, stockDesc.getCname());
 					}
 				} else {
 					lambdaQueryWrapper.and(i -> i.like(PjStockDesc::getCname, stockDesc.getCname())