From 19fe6936cbe4deef1f18186350a71acff4dff58e Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 14 一月 2025 17:06:18 +0800 Subject: [PATCH] # 24. PDA出库成功后,界面数据重置,避免重复操作 (已修复) 25. PDA接口请求,添加一个Loading遮档 (已修复) 27. 非平库单据,在平库可做入库操作 (已修复) 29. 平库入库后,订单明细没有添加(已修复) 30. 平库入库后,单据类型没有修改(已修复) 31. 没有绑定播种位,不能进行播种,前后端都需加判定(已修复) 33. 平库入库未修改入库已完成数量(已修复) --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/UserRole.java | 80 ++++++++++++++++++++-------------------- 1 files changed, 40 insertions(+), 40 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/UserRole.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/UserRole.java index 361d2a7..45dac6b 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/UserRole.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/UserRole.java @@ -1,40 +1,40 @@ -package com.zy.asrs.wms.system.entity; - -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.Data; - -import java.io.Serializable; - -@Data -@TableName("sys_user_role") -public class UserRole implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value= "") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - @ApiModelProperty(value= "") - private Long userId; - - @ApiModelProperty(value= "") - private Long roleId; - - public UserRole() {} - - public UserRole(Long userId,Long roleId) { - this.userId = userId; - this.roleId = roleId; - } - -// UserRole userRole = new UserRole( -// null, // [闈炵┖] -// null // [闈炵┖] -// ); - - -} +package com.zy.asrs.wms.system.entity; + +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.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_user_role") +public class UserRole implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value= "") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + @ApiModelProperty(value= "") + private Long userId; + + @ApiModelProperty(value= "") + private Long roleId; + + public UserRole() {} + + public UserRole(Long userId,Long roleId) { + this.userId = userId; + this.roleId = roleId; + } + +// UserRole userRole = new UserRole( +// null, // [闈炵┖] +// null // [闈炵┖] +// ); + + +} -- Gitblit v1.9.1