Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

14 小时以前 c255a17d7ef4fabb37c1ac84b212768e73c42915

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java

@@ -100,7 +100,7 @@
     * 预计到达时间
     */
    @ApiModelProperty(value= "预计到达时间")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    private Date arrTime;

    /**
@@ -129,6 +129,7 @@
     * 是否删除 1: 是  0: 否  
     */
    @ApiModelProperty(value= "是否删除 1: 是  0: 否  ")
    @TableLogic
    private Integer deleted;

    /**