Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1

Junjie

2023-12-06 828b592b5f8e31204f93bcc2ea0c5866bdc0dcf0

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

@@ -48,7 +48,7 @@
    /**
     * 物料
     */
    @ApiModelProperty(value= "单据号")
    @ApiModelProperty(value= "物料号")
    private String matnr;

    /**