合并代码，解决冲突

zhangchao

2024-11-02 c51ab886ca899243f36cffe6c1a86d19057d44f5

 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java

@@ -134,7 +134,7 @@
            if (pltType != null && pltType > 0) {
                order.setPltType(pltType);
            }
            order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMdd));
            order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMdd_F));
            super.updateById(order);

        }