Merge remote-tracking branch 'origin/master'

xuhy

6 天以前 e61186cbec713d4d7d6c7c685dc9576d0635a521

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java

@@ -225,7 +225,7 @@
            return R.fail("该订单已发货");
        }
        exchange1.setStatus(2);
        exchange1.setLogisticsNumber(exchange1.getLogisticsNumber());
        exchange1.setLogisticsNumber(exchange.getLogisticsNumber());
        sysGoodsExchangeService.updateById(exchange1);
        return R.ok();
    }