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

gongchunyi

2026-04-13 f4d6d9d7ae1d0f1af6937dd7a2761056e46611c2

 src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java

@@ -43,7 +43,7 @@
    @ApiOperation("添加支付与发货信息")
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult add(@RequestBody PaymentShipping paymentShipping) {
        String ord = OrderUtils.countTodayByCreateTime(paymentShippingMapper, "ORD");
        String ord = OrderUtils.countTodayByCreateTime(paymentShippingMapper, "ORD","orderNo");
        paymentShipping.setOrderNo(ord);
        boolean save = paymentShippingService.save(paymentShipping);
        return save ? success() : error();