diff --git a/lms/nladmin-system/doc/wms.xls b/lms/nladmin-system/doc/wms.xls index 192d017..38c5808 100644 Binary files a/lms/nladmin-system/doc/wms.xls and b/lms/nladmin-system/doc/wms.xls differ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/MdBaseWorkshop.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/MdBaseWorkshop.java index 3901320..37a487a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/MdBaseWorkshop.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/MdBaseWorkshop.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; @@ -17,25 +16,17 @@ import java.io.Serializable; * @date 2023-05-05 **/ @Data -@Builder @EqualsAndHashCode(callSuper = false) @TableName("md_base_workshop") public class MdBaseWorkshop implements Serializable { private static final long serialVersionUID = 1L; - - @TableId(value = "workshop_id", type = IdType.NONE) - @ApiModelProperty(value = "车间标识") - private String workshop_id; - - @ApiModelProperty(value = "车间名称 ") + @TableId(value = "workshop_code", type = IdType.NONE) + @ApiModelProperty(value = "车间编码") private String workshop_code; @ApiModelProperty(value = "车间名称 ") private String workshop_name; - @ApiModelProperty(value = "车间类型 ") - private String workshop_type; - @ApiModelProperty(value = "备注") private String remark;