Merge branch 'dev' into test

5 years ago · 6b66c15c72
parent b27bbb6158 ab3ad4c2d5
commit 6b66c15c72
1 changed files with 0 additions and 1 deletions
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java
@ -10,7 +10,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.context.annotation.Lazy;
 import javax.persistence.*;