解决冲突

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java

@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import lombok.Data;
+
+/**
+ * @Description : 可选项模型
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-30 10:50
+ * @Modify:
+ **/
+@Data
+public class OptionModel {
+
+    private String code;
+
+    private String name;
+
+    private Boolean value;
+}