From bd331a582851cffcce54316e677e23760de4f384 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 24 六月 2019 11:36:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/QualityFactory.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/QualityFactory.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/QualityFactory.java
index 78c465e..b1b66d8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/QualityFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/QualityFactory.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.entity.bus.lable;
+import java.io.Serializable;
import java.util.Date;
import org.yeshi.utils.mybatis.Column;
@@ -16,8 +17,12 @@
* @date 2018骞�7鏈�3鏃�
*/
@Table("yeshi_ec_quality_factory")
-public class QualityFactory {
+public class QualityFactory implements Serializable{
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
// 浜哄伐绛涢�夊叆搴�
public final static int MODE_MANUAL = 1;
// 绯荤粺绠楁硶 -鑷姩鍏ュ簱
--
Gitblit v1.8.0