452 Commits (6061f89d43525d02e18e878efddf1093b181b4d8)

Author	SHA1	Message	Date
钮海涛	6061f89d43	修复合并版本问题	5 years ago
钮海涛	b303cf9a14	修复合并问题	5 years ago
wynne1005	5ef88c80c0	提测合并 还原pom	5 years ago
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
钮海涛	53a421b3b9	修复版本问题	5 years ago
王杰	a6e9b90026	pom	5 years ago
王杰	de9017ca5c	冲突	5 years ago
王杰	7d192b36a6	pom冲突	5 years ago
钮海涛	005d0f7f86	修复合并问题	5 years ago
钮海涛	bc269e1f71	Merge branch 'master' into test	5 years ago
陈思洁	a8ae48b132	【7937 半成品箱条码绑定工步-数据写入缺少】	5 years ago
wei.peng	37922cab29	POM 文件修改 ... Merge remote-tracking branch 'remotes/origin/test' # Conflicts: # modules/i3plus-icloud-report/pom.xml	5 years ago
wei.peng	fe94ad9bf3	Merge remote-tracking branch 'remotes/origin/test'	5 years ago
钮海涛	a1eb3c3bc2	修复pom版本问题	5 years ago
钮海涛	2cc43af431	修复pom版本问题	5 years ago
钮海涛	c6d36af4c9	Merge branch 'master' into test	5 years ago
wynne1005	fb60d75eea	还原test pom	5 years ago
wynne1005	d6fe718e4c	Merge branch 'dev' into test	5 years ago
wynne1005	109c4429ce	还原dev pom	5 years ago
钮海涛	efe083a9da	修复版本号	5 years ago
钮海涛	288fb4a16b	修改POM版本号	5 years ago
汪云昊	2772ea6a2f	Merge remote-tracking branch 'remotes/origin/dev' into test ... # Conflicts: # modules/i3plus-pojo-andon/pom.xml # modules/i3plus-pojo-aps/pom.xml # modules/i3plus-pojo-base/pom.xml # modules/i3plus-pojo-form/pom.xml # modules/i3plus-pojo-hardswitch/pom.xml # modules/i3plus-pojo-jobflow/pom.xml # modules/i3plus-pojo-lac/pom.xml # modules/i3plus-pojo-mes-pcn/pom.xml # modules/i3plus-pojo-mes/pom.xml # modules/i3plus-pojo-model/pom.xml # modules/i3plus-pojo-platform/pom.xml # modules/i3plus-pojo-ptl/pom.xml # modules/i3plus-pojo-report/pom.xml # modules/i3plus-pojo-softswitch/pom.xml # modules/i3plus-pojo-sweb/pom.xml # modules/i3plus-pojo-wms/pom.xml # modules/i3plus-pojo-workflow/pom.xml # pom.xml	5 years ago
汪云昊	8a8c3ee34d	pom版本调整	5 years ago
贾文涛	492dfbff82	pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式	5 years ago
钮海涛	52a5c1e2f8	Merge branch 'test' into dev	5 years ago
wynne1005	4324457b61	merge	5 years ago
qianhs	241ec4974b	联调测试	5 years ago
钮海涛	82d5332861	修复POM文件问题	5 years ago
汪云昊	ec1d52e7dd	MAVEN 版本控制调整	5 years ago
贾文涛	7106c06221	统一修改pom文件的项目版本问题0331	5 years ago
wynne1005	44696061ee	修改pom文件为最新	5 years ago
贾文涛	eed24e0297	统一修改pom文件的项目版本问题	5 years ago
wynne1005	d80b341620	还原test pom	5 years ago
贾文涛	048419d823	修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。	5 years ago
qianhs	564ba1e116	【1472 工步-设备状态采集（原PLC采集【设备状态】）】	5 years ago
zcg	74e4aa953b	【任务 1480 照片采集】	5 years ago
陈思洁	22788f1c44	还原POM文件TEST-DEV	5 years ago
王杰	b6a83fff5d	Merge branch 'dev' into test	5 years ago
zcg	3d28840bae	【新增枚举，pojo】	5 years ago
luweihao	16879a4f20	Merge branch 'dev' into test	5 years ago
luweihao	12579c7a14	还原pom	5 years ago
zcg	7aecf9dcc0	【task 1436 工步-关键件绑定校验并转过程条码】	5 years ago
luweihao	5892f87bdc	task `1425` pcn pojo 迁移	5 years ago
luweihao	e2d63434db	bug `7570` `7561` 生产扣减代码去除测试代码	5 years ago
luweihao	b556051295	task 修改监控类位置	5 years ago
luweihao	1b727f1721	task 任务重试测试	5 years ago
luweihao	68cbd54f37	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	5fd51f6b1d	task 任务重试测试	5 years ago
joke	d42b7ebbb6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke	2b84f93950	任务: 1424 DT通信	5 years ago