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

lfd

2026-03-26 3a2158fe78db763c72d5124a964d7fd7934b51ac

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

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

    @ApiModelProperty(value= "批号")
    @ExcelProperty("批号")
    @ApiModelProperty(value= "规格")
    @ExcelProperty("规格")
    private String specs;

    @ApiModelProperty(value= "货品特征")
    @ExcelProperty("货品特征")
    private String batch;

    @ApiModelProperty(value= "单据编号")
    @ExcelProperty("单据编号")
    @TableField("order_no")
    private String orderNo;

    @ApiModelProperty(value= "规格")
    private String specs;

    @ApiModelProperty(value= "型号")
    private String model;
@@ -231,7 +232,6 @@
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
    }


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