1000 Commits (6169542dbb9530958bbda53867a919155f176f95)

Author	SHA1	Message	Date
wei.peng	6169542dbb	合并代码  有代码丢失或者文件丢失请排查此处 ... Merge remote-tracking branch 'remotes/origin/dev' into test # Conflicts: # modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java	5 years ago
王杰	8e94cbb8fa	pojo 序列号	5 years ago
袁津哲	8b63dea809	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	08b03c9eb8	Task1858:电枪枪头更换计数	5 years ago
宋军超	8d2f6fb8d1	任务：【1842】-海纳川基础数据修改字段类型	5 years ago
joke.wang	88a0d6d02f	任务:[1828] 半成品绑定工步增加逻辑	5 years ago
陈思洁	8ab6e77620	【8528 收货检验-图片上传未开发】	5 years ago
宋军超	1f55c06368	任务：【1842】-海纳川通用导入添加对应工具类、实体和model	5 years ago
陈思洁	7eb72ee5d1	【调试接口回传和同步】	5 years ago
宋军超	9778561725	任务：【1842】-添加海纳川基础数据维护模块	5 years ago
陈思洁	a1c0b6ff26	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	1ea5b54052	【生成质检单增加是否让步字段】	5 years ago
joke.wang	b741b6950b	bug: [8516] 重新计算bug 1	5 years ago
王杰	786c442d55	解决冲突	5 years ago
宋军超	18e037da7f	任务：【1842】-添加海纳川基础数据的Repository	5 years ago
宋军超	af6b0ce0fd	任务：【1842】-添加海纳川5个基础数据模块的实体与枚举	5 years ago
joke.wang	0352980cde	bug: [8516] 重新计算bug修复	5 years ago
钮海涛	c1241bd6c5	修复版本问题	5 years ago
钮海涛	53a421b3b9	修复版本问题	5 years ago
钮海涛	94e9b2ffec	Merge remote-tracking branch 'remotes/origin/master' into test	5 years ago
王杰	029763feb1	pom	5 years ago
王杰	30fcf4f23f	pom冲突	5 years ago
王杰	716e1f7df1	Merge branch 'test' into dev	5 years ago
陈思洁	9cc193c12b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	d2a31eac70	【1804 质检检测-来料检验功能】	5 years ago
joke.wang	25bd05348d	[serialVersionUID重复问题]	5 years ago
汪云昊	717f268c28	POJO版本号还原	5 years ago
钮海涛	281ef662b1	merge test	5 years ago
陈思洁	6fbfea417f	【1804 质检检测-来料检验功能】	5 years ago
陈思洁	aef8841223	【合并冲突】	5 years ago
陈思洁	60973a3ee0	【1804 质检检测-来料检验功能】	5 years ago
贾文涛	c4510fb121	BUG #8485,修复数据权限-查询启用禁用无效	5 years ago
宋军超	00df3134b2	任务：【1829】-更新检测单和检测单明细实体	5 years ago
joke.wang	de9c901a3b	[任务：1826 库存排程配置]	5 years ago
joke.wang	222ba4f8a4	[任务：1825 plc增加默认属性字段]	5 years ago
王杰	a6e9b90026	pom	5 years ago
宋军超	1f97be3078	添加检测结果报表（5个界面）	5 years ago
宋军超	82af372fc0	添加检测过程类型枚举	5 years ago
王杰	de9017ca5c	冲突	5 years ago
王杰	c68d49880c	Merge branch 'dev' into test	5 years ago
王杰	7d192b36a6	pom冲突	5 years ago
joke.wang	1fec97f0c1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke.wang	24806b9e2e	[oee优化]	5 years ago
宋军超	78ff224fe4	删除查询供应商	5 years ago
宋军超	79e90298ef	添加供应商查询	5 years ago
宋军超	98091426f2	修改实体	5 years ago
宋军超	f302b4d5f1	修改MES_检验单实体字段	5 years ago
宋军超	e7335bb632	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	4f5f9777a2	修改实体与model字段	5 years ago
贾文涛	f7b3250d70	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago