Merge remote-tracking branch 'origin/nbncasrs' into nbncasrs

zjj

2024-05-29 73f923ea4ececa98dcbf091903ddbe91efe0a8c0

 zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/GenerateOrderPakOutParam.java

@@ -10,11 +10,11 @@

    private String orderNo;

    private String orderType;
    private Integer orderType;

    private String orderTime;

    private List<DetlDto> orderDetails;
    private List<GenerateOrderMatParam> mats;

    private Long hostId;