55 Commits (70693d5b638fa9f40eaeb29d70b341345cd6be7c)

Author	SHA1	Message	Date
钮海涛	7ca3b43bfe	合并DEV分支代码	5 years ago
钮海涛	b04ef3caa4	合并TEST分支代码	5 years ago
钮海涛	ef40f20e1d	解决合并冲突	5 years ago
钮海涛	81266fbfb6	解决合并冲突	5 years ago
钮海涛	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
袁津哲	0067e31420	合并test分支代码到dev分支	5 years ago
钮海涛	2f8b0ba5db	修复版本问题	5 years ago
钮海涛	4921d55bda	修复版本问题	6 years ago
钮海涛	b303cf9a14	修复合并问题	6 years ago
wynne1005	5ef88c80c0	提测合并 还原pom	6 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	6 years ago
钮海涛	53a421b3b9	修复版本问题	6 years ago
王杰	a6e9b90026	pom	6 years ago
王杰	de9017ca5c	冲突	6 years ago
王杰	eaecf4b4b7	pom	6 years ago
王杰	7d192b36a6	pom冲突	6 years ago
钮海涛	005d0f7f86	修复合并问题	6 years ago
wei.peng	37922cab29	POM 文件修改 ... Merge remote-tracking branch 'remotes/origin/test' # Conflicts: # modules/i3plus-icloud-report/pom.xml	6 years ago
钮海涛	a1eb3c3bc2	修复pom版本问题	6 years ago
钮海涛	c6d36af4c9	Merge branch 'master' into test	6 years ago
钮海涛	efe083a9da	修复版本号	6 years ago
钮海涛	288fb4a16b	修改POM版本号	6 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	6 years ago
汪云昊	8a8c3ee34d	pom版本调整	6 years ago
钮海涛	1d16e2d938	解决合并冲突	6 years ago
贾文涛	492dfbff82	pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式	6 years ago
钮海涛	82d5332861	修复POM文件问题	6 years ago
汪云昊	ec1d52e7dd	MAVEN 版本控制调整	6 years ago
贾文涛	7106c06221	统一修改pom文件的项目版本问题0331	6 years ago
wynne1005	44696061ee	修改pom文件为最新	6 years ago
wynne1005	d80b341620	还原test pom	6 years ago
贾文涛	048419d823	修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。	6 years ago
曾贞一	779b9d209c	【修改 DEV-pom.xml】	6 years ago
luweihao	12579c7a14	还原pom	6 years ago
王杰	cfa54aa2b6	修改pom	6 years ago
王杰	ac5432bebb	解决冲突	6 years ago
曾贞一	7a62200736	Merge remote-tracking branch 'remotes/origin/test' ... # Conflicts: # modules/i3plus-pojo-andon/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-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	6 years ago
曾贞一	8b457c0618	DEV 合并 TEST pom.xml文件修改	6 years ago
于学杰	e7913cfb26	1. 从 TEST 合并代码后 POM 文件中引用的版本不正确，修改为 DEV	6 years ago
yunhao.wang	6ebc22e6cc	master分支配置调整	7 years ago