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

czkh

2 天以前 975823f4d07c91a67162f553be9ff4ac25f3d47d

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

@@ -174,7 +174,9 @@
    @TableField("temp1")

    private String temp1;
    @TableField("temp2")

    private String temp2;

    @TableField("packing")
    private String packing;