108 Commits (9a516f893fdf6e859b4b1496699d2e42fc580732)

Author	SHA1	Message	Date
钮海涛	9a516f893f	合并dev代码到test	5 years ago
钮海涛	6033695b99	修复合并版本问题	5 years ago
wynne1005	085f15427d	还原pom	5 years ago
wynne1005	dfa993b9e9	还原pom	5 years ago
wynne1005	15f0a37508	还原pom	5 years ago
wynne1005	bcb4e5ad13	merge test	5 years ago
wynne1005	31b5f3e234	merge dev 还原pom	5 years ago
wynne1005	b18408b3bb	merge test	5 years ago
wynne1005	b0b07437d6	还原pom	5 years ago
wynne1005	60c1f6ecab	还原pom	5 years ago
wynne1005	47ae0b46ef	还原pom	5 years ago
袁津哲	adb974d874	合并test分支代码到dev分支	5 years ago
钮海涛	ae805a6596	修复Bug	5 years ago
袁津哲	0067e31420	合并test分支代码到dev分支	5 years ago
钮海涛	2f8b0ba5db	修复版本问题	5 years ago
钮海涛	a71d7a31ce	Merge branch 'master' into test	5 years ago
钮海涛	5a0fea01ca	修复版本问题	5 years ago
钮海涛	6061f89d43	修复合并版本问题	5 years ago
wynne1005	b43317c11a	还原pom	5 years ago
钮海涛	3a40d278ac	修复平台登录问题	5 years ago
钮海涛	470bceac6a	Start Task #1973 Cost:2h ... Start Task #1971 Cost:2h Start Task #1970 Cost:2h Effort Task #1968 Cost:4h	5 years ago
钮海涛	f1a6f66ccb	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	15a3d95c61	Start Task #1968 Cost:3h	5 years ago
钮海涛	47131ff13f	修复版本问题	5 years ago
wynne1005	99d3c9d721	提测合并 还原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
王杰	786c442d55	解决冲突	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
qianhs	3ffa9d06fa	sweb pojo 序列化提交	5 years ago
汪云昊	717f268c28	POJO版本号还原	5 years ago
王杰	a6e9b90026	pom	5 years ago
王杰	de9017ca5c	冲突	5 years ago
王杰	eaecf4b4b7	pom	5 years ago
王杰	7d192b36a6	pom冲突	5 years ago
钮海涛	005d0f7f86	修复合并问题	5 years ago
wei.peng	37922cab29	POM 文件修改 ... Merge remote-tracking branch 'remotes/origin/test' # Conflicts: # modules/i3plus-icloud-report/pom.xml	5 years ago
钮海涛	a1eb3c3bc2	修复pom版本问题	5 years ago
钮海涛	c6d36af4c9	Merge branch 'master' into test	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
钮海涛	1d16e2d938	解决合并冲突	5 years ago
贾文涛	492dfbff82	pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式	5 years ago
钮海涛	82d5332861	修复POM文件问题	5 years ago