Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs

luxiaotao1123

2021-09-14 c6bc9682699d3e10dc06a3d6641a70179e64f9a1

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

@@ -36,10 +36,12 @@

    @ApiModelProperty(value= "产品编码")
    @TableId(value = "mat_no")
    @TableField("mat_no")
    private String matNo;

    @ApiModelProperty(value= "产品名称")
    @TableId(value = "mat_name")
    @TableField("mat_name")
    private String matName;

    @ApiModelProperty(value= "规格")
@@ -132,6 +134,10 @@
    @TableField("appe_time")
    private Date appeTime;

    @ApiModelProperty(value= "库位号")
    @TableField(exist = false)
    private String locNo;

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