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

18516761980

2022-06-16 f141339cedfefafc5c4820b8891f2b916a4889e2

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

@@ -43,8 +43,8 @@
    @ExcelProperty("商品名称")
    private String maktx;

    @ApiModelProperty(value= "批号")
    @ExcelProperty("批号")
    @ApiModelProperty(value= "序列码")
    @ExcelProperty("序列码")
    private String batch;

    @ApiModelProperty(value= "单据编号")
@@ -231,7 +231,6 @@
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
    }


    public String getAppeUser$(){
        UserService service = SpringUtils.getBean(UserService.class);