Merge remote-tracking branch 'origin/master'

xuhy

2 天以前 72aaf45389cd09c206ee1b90f0c7f5bf59782930

 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();
    }