合并冲突

5 years ago · 27c62aa7d1
parent cad6b7ad89
commit 27c62aa7d1
1 changed files with 2 additions and 1 deletions
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java
@ -4,7 +4,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

-import javax.persistence.Column;
+import javax.persistence.Entity;

 /**
 * @Description : 零件自动采购单信息
@ -14,6 +14,7 @@ import javax.persistence.Column;
 * @Modify:
 **/
@Data
+@Entity
@Api("收货追踪地图信息")
 public class WmsAutoPurchasePartModel {
    @ApiParam("合同号")