I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
yun-zuoyi
许心洁 6 years ago
parent d8786d8132 fb07628555
commit af7b2404dd
19 changed files with 21 additions and 50 deletions
Show Stats Download Patch File Download Diff File

2
modules/i3plus-pojo-andon/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-pojo</artifactId> <artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-base/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-pojo</artifactId> <artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
Unescape Escape View File

@ -833,7 +833,7 @@ public class BlockFormEnumUtil {
PASSWORD(230, "PASSWORD", "密码"), PASSWORD(230, "PASSWORD", "密码"),
DATE(300, "DATE", "日期(yyyy-MM-dd)"), DATE(300, "DATE", "日期(yyyy-MM-dd)"),
DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"), DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"),
// ELEMENT(700, "DICT_SELECT", "元素"), // ELEMENT(700, "DICT_SELECT", "元素"),
DICTIONARY(800, "DICT_SELECT", "字典"), DICTIONARY(800, "DICT_SELECT", "字典"),
CASCADE(900, "CASCADE", "级联"); CASCADE(900, "CASCADE", "级联");
//FILE(400, "file", "文件"), //FILE(400, "file", "文件"),

2
modules/i3plus-pojo-form/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-pojo</artifactId> <artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-hardswitch/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-pojo</artifactId> <artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-jobflow/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-pojo</artifactId> <artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-lac/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-pojo</artifactId> <artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-mes-pcn/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-pojo</artifactId> <artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-mes/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-pojo</artifactId> <artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-model/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-pojo</artifactId> <artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java
Unescape Escape View File

@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.model.wms;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.Data; import lombok.Data;
import lombok.ToString;
/** /**
* @Description : 收货扫描条码组件 参数封装 * @Description : 收货扫描条码组件 参数封装
@ -12,7 +11,6 @@ import lombok.ToString;
* @Modify: * @Modify:
**/ **/
@Data @Data
@ToString
public class TransSnModle extends BaseComponetsParam{ public class TransSnModle extends BaseComponetsParam{
@ApiParam(value = "移动单号") @ApiParam(value = "移动单号")

2
modules/i3plus-pojo-platform/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-pojo</artifactId> <artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-report/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-pojo</artifactId> <artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-softswitch/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-pojo</artifactId> <artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-sweb/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-pojo</artifactId> <artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

11
modules/i3plus-pojo-wms/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-pojo</artifactId> <artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -18,11 +18,10 @@
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-base</artifactId> <artifactId>i3plus-pojo-base</artifactId>
</dependency> </dependency>
<!-- <dependency>--> <!--<dependency>-->
<!-- <groupId>i3plus.platform</groupId>--> <!--<groupId>i3plus.platform</groupId>-->
<!-- <artifactId>i3plus-platform</artifactId>--> <!--<artifactId>i3plus-platform-common</artifactId>-->
<!-- <version>1.0-DEV-SNAPSHOT</version>--> <!--</dependency>-->
<!-- </dependency>-->
</dependencies> </dependencies>

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java
Unescape Escape View File

@ -5,7 +5,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString;
import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.DynamicUpdate;
@ -20,7 +19,6 @@ import javax.persistence.*;
* @Modify: * @Modify:
**/ **/
@Data @Data
@ToString
@Entity @Entity
@DynamicInsert @DynamicInsert
@DynamicUpdate @DynamicUpdate

2
modules/i3plus-pojo-workflow/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-pojo</artifactId> <artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

26
pom.xml
Unescape Escape View File

@ -15,8 +15,7 @@
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo</artifactId> <artifactId>i3plus-pojo</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.0-DEV-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<modules> <modules>
<module>modules/i3plus-pojo-base</module> <module>modules/i3plus-pojo-base</module>
<module>modules/i3plus-pojo-platform</module> <module>modules/i3plus-pojo-platform</module>
@ -187,27 +186,4 @@
<url>http://mvn.estsh.com/repository/maven-snapshots/</url> <url>http://mvn.estsh.com/repository/maven-snapshots/</url>
</snapshotRepository> </snapshotRepository>
</distributionManagement> </distributionManagement>
<!--<build>-->
<!--<plugins>-->
<!--<plugin>-->
<!--<groupId>org.springframework.boot</groupId>-->
<!--<artifactId>spring-boot-maven-plugin</artifactId>-->
<!--</plugin>-->
<!--&lt;!&ndash; 添加编译插件 &ndash;&gt;-->
<!--<plugin>-->
<!--<groupId>org.apache.maven.plugins</groupId>-->
<!--<artifactId>maven-compiler-plugin</artifactId>-->
<!--<version>3.5.1</version>-->
<!--<configuration>-->
<!--<source>1.8</source>-->
<!--<target>1.8</target>-->
<!--<encoding>UTF-8</encoding>-->
<!--</configuration>-->
<!--</plugin>-->
<!--</plugins>-->
<!--</build>-->
</project> </project>
Write Preview
Loading…
Cancel
Save