Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java

@@ -51,7 +51,7 @@ public class MesExtendObjectCfg extends BaseBean implements Serializable {
     private Integer fieldType;
 
     @Column(name = "FIELD_LENGTH")
-    @ApiParam("扩展字段类型")
+    @ApiParam("扩展字段长度")
     private String fieldLength;
 
     @Column(name = "DEFAULT_VALUE")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java

@@ -151,6 +151,11 @@ public class MesWorkOrderLog extends BaseBean implements Serializable {
     @ApiParam("首检生成数量")
     private Double fiGenerateQty;
 
+    @Lob
+    @Column(name = "EXTEND")
+    @ApiParam("扩展数据")
+    private String extend;
+
     @Column(name = "RESERVED1")
     @ApiParam("预留字段1")
     private String reserved1;
@@ -167,10 +172,6 @@ public class MesWorkOrderLog extends BaseBean implements Serializable {
     @ApiParam("预留字段4")
     private String reserved4;
 
-    @Column(name = "RESERVED5")
-    @ApiParam("预留字段5")
-    private String reserved5;
-
     /**********************  冗余字段 *********************************/
     @Transient
     @ApiParam(value = "工作中心名称")

sonar-project.properties

@@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 # defaults to project key
 sonar.projectName=i3plus-pojo
 # defaults to 'not provided'
-sonar.projectVersion=1.0-DEV-SNAPSHOT
+sonar.projectVersion=1.0-TEST-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./