Merge branch 'phyzasrs-erp' into phyzasrs-erp-4

zhangc

2024-12-23 dcc9b7294a7f47c00445d2b8dec0097b6b3b0e5e

 src/main/java/com/zy/asrs/entity/Order.java

@@ -270,7 +270,7 @@
     */
    @ApiModelProperty(value = "入库日期")
    @TableField("in_time")
    private String InTime;
    private String inTime;


    @TableField("Upstreamcode")