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

# Conflicts:
#	modules/i3plus-pojo-base/pom.xml
#	modules/i3plus-pojo-mes/pom.xml
#	modules/i3plus-pojo-model/pom.xml
#	modules/i3plus-pojo-platform/pom.xml
#	modules/i3plus-pojo-wms/pom.xml
#	pom.xml

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java

@@ -18,7 +18,7 @@ import javax.persistence.Table;
  * @Author : hansen.ke
  * @CreateDate : 2018-11-28 15:20
  * @Modify:
- *  2018-12-10 10:39:46
+ *  2018-12-10 10:39:46 Test
  **/
 @Data
 @Entity