Merge remote-tracking branch 'origin/phyzasrs-erp' into phyzasrs-erp

zhangchao

2024-11-02 3d321d82df16121e1c21fb2113757e5a16de54a2

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

@@ -1001,7 +1001,7 @@

        order.setCreateTime(now);
        order.setUpdateTime(now);

        order.setUpstreamcode(param.getUpstreamcode());
        //订单状态
        order.setSettle(1L);
        //状态