8 Commits (2a09c009f377ec49b6b6912b8f54f5e53922e788)

Author	SHA1	Message	Date
许心洁	2a09c009f3	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	0fe0abff63	新增区域、区段、标签控制器、标签信息、BOM和物料 基础数据	5 years ago
宋军超	896bd9b35b	添加基础数据枚举	5 years ago
宋军超	60ad38649d	新增区域、区段、标签控制器、标签信息、BOM和物料 基础数据	5 years ago
王杰	b516ca254c	解决冲突	5 years ago
王杰	39a454f89b	ptl	5 years ago
wei.peng	b199c5995f	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-ics into test ... # Conflicts: # modules/i3plus-ics-console/src/main/resources/application.properties # modules/i3plus-ics-gateway/src/main/resources/application.properties # modules/i3plus-ics-regist/src/main/resources/application.properties	5 years ago
wei.peng	e1dd7c3cdd	PTL 项目初始化	5 years ago