解决冲突

6 years ago · cb8d841aee
parent ffb29d0d03
commit cb8d841aee
1 changed files with 5 additions and 6 deletions
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java
@ -11,7 +11,6 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.servlet.http.HttpServletRequest;
 /**
 * @Description : 用户登录记录