Merge remote-tracking branch 'origin/master'

王佳豪

2021-06-07 752332b433e6ddd72f8e4dd551a0eeb2e3c0939b

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

@@ -140,6 +140,13 @@
    @TableField("appe_time")
    private Date appeTime;

    /**
     * 物料状态 (1良品，2不良品)
     */
    @ApiModelProperty(value= "物料状态")
    @TableField("mat_status")
    private String matStatus;

    public String getIoTime$(){
        if (Cools.isEmpty(this.ioTime)){
            return "";