503 Commits (4921d55bda604b7334be48bcea9862edff365ea4)

Author	SHA1	Message	Date
钮海涛	4921d55bda	修复版本问题	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
wei.peng	9ee8acae91	合并代码 有代码丢失或者文件丢失请排查此处	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
wei.peng	c288b54660	查询优化	5 years ago
汪云昊	717f268c28	POJO版本号还原	5 years ago
汪云昊	8fe0244a20	POJO添加序列化id	5 years ago
汪云昊	9532489502	POJO添加序列化id	5 years ago
wei.peng	3669fbb4a4	本地版本库雪崩,有问题请排查此版本	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
钮海涛	bc269e1f71	Merge branch 'master' into test	5 years ago
wynne1005	27e4fb164b	Merge branch 'dev' into test	5 years ago
汪云昊	32460a3272	sqlserver 适配处理，in 参数类型不准确	5 years ago
汪云昊	2ab9045d17	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
汪云昊	30c0b2e46a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
汪云昊	d4a91b6d69	缺失资源接口优化	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
wei.peng	3aa1afb0ce	对象历史记录 Pojo 创建	5 years ago
wei.peng	c8197f3290	1. 授权封装位置调整 ... 2. 日志控制台查询封装 3. 添加软适配 同步接口调用 4. pom.xml 引用错误修复	5 years ago
wei.peng	9d3a4db040	日志查询Bug 修复	5 years ago
wei.peng	fee90baf64	1. 关闭register , gateway , console 日志持久化技术 ... 2. Sonar Bug 修复 3. 自定义日志持久化	5 years ago
wei.peng	effae233bf	对象历史记录 Pojo 创建	5 years ago
wei.peng	fe46d8da29	1. 授权封装位置调整 ... 2. 日志控制台查询封装 3. 添加软适配 同步接口调用 4. pom.xml 引用错误修复	5 years ago
wei.peng	69346da06d	日志查询Bug 修复	5 years ago
wei.peng	dac1358009	1. 关闭register , gateway , console 日志持久化技术 ... 2. Sonar Bug 修复 3. 自定义日志持久化	5 years ago
wynne1005	d6fe718e4c	Merge branch 'dev' into test	5 years ago
汪云昊	edf0b66115	Sonar代码缺陷修复 ... 查询条件优化 拦截器，自定义按钮对外接口实现 表单-功能目录优化 软适配日志优化	5 years ago
钮海涛	efe083a9da	修复版本号	5 years ago
钮海涛	288fb4a16b	修改POM版本号	5 years ago
钮海涛	aff68cd087	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	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
汪云昊	e7d176209e	Merge branch 'dev' of yunhao.wang/i3plus-pojo into dev	5 years ago
汪云昊	64d83d238f	Merge branch 'dev' of wei.peng/i3plus-pojo into dev	5 years ago
汪云昊	3fd17208e2	枚举更新	5 years ago
钮海涛	1d16e2d938	解决合并冲突	5 years ago