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

mitao

2025-03-11 396b0760eeee4f37a21cc708955cda45ca746aa5

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java

@@ -573,6 +573,7 @@

    @Override
    public MemberTiOrderVO updMemberOrder(MemberOrderDTO memberOrderDTO) {

        Order order = baseMapper.selectById(memberOrderDTO.getId());
        if(memberOrderDTO.getOrderRemark()!=null){
            order.setOrderRemark(memberOrderDTO.getOrderRemark());