291 Commits (yun-zuoyi)

Author	SHA1	Message	Date
汪云昊	c9b4b37c23	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	687de9d828	feat(form):支持存储过程参数	5 years ago
汪云昊	15dc4b00c7	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	ed22bd6f64	feat(form):存储过程调用适配mysql,mssql	5 years ago
汪云昊	171f39cf01	revert:还原pojo pom.xml报表	5 years ago
钮海涛	543058b3a5	合并sweb代码	5 years ago
汪云昊	163d0773a9	修改pom文件版本	5 years ago
钮海涛	e6b472bcfd	合并test代码到dev	5 years ago
钮海涛	92f0158dab	合并master代码	5 years ago
王杰	6c5e646d49	test merge master	5 years ago
钮海涛	7ca3b43bfe	合并DEV分支代码	5 years ago
钮海涛	b04ef3caa4	合并TEST分支代码	5 years ago
钮海涛	ef40f20e1d	解决合并冲突	5 years ago
钮海涛	3c22c8e3f4	test版本合并到master	5 years ago
钮海涛	e140910db7	Merge remote-tracking branch 'origin/test' into test	5 years ago
汪云昊	c230c57c97	定时任务 导入导出 ... 定时任务 重载功能	5 years ago
王杰	b3999ad481	dev merge test	5 years ago
王杰	767c1bffbc	test merge dev	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
汪云昊	6d71c01178	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	fdd5516a0f	FTP适配器优化 ... 表单功能优化 UA 适配 LONG类型	5 years ago
wei.peng	ec3febfaa9	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
wynne1005	b0b07437d6	还原pom	5 years ago
汪云昊	4de301bf79	MDM 系统结构优化 ... 单元测试开关	5 years ago
wynne1005	60c1f6ecab	还原pom	5 years ago
wynne1005	47ae0b46ef	还原pom	5 years ago
袁津哲	0067e31420	合并test分支代码到dev分支	5 years ago
钮海涛	7982cefc1e	Merge branch 'test' into dev	5 years ago
钮海涛	2f8b0ba5db	修复版本问题	5 years ago
汪云昊	2f71b79ed8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
汪云昊	fb603db58e	表单拾取功能	5 years ago
钮海涛	32a566be93	Merge branch 'test' into dev	5 years ago
钮海涛	6061f89d43	修复合并版本问题	5 years ago
汪云昊	a4ba058ee3	表单查询条件 ... Rest是适配器 requestBody	5 years ago
钮海涛	999a415d27	修复版本问题	5 years ago
钮海涛	b303cf9a14	修复合并问题	5 years ago
wynne1005	99d3c9d721	提测合并 还原pom	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
王杰	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
汪云昊	717f268c28	POJO版本号还原	5 years ago
汪云昊	9532489502	POJO添加序列化id	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
汪云昊	2ab9045d17	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
汪云昊	71d30c3232	表单-自定义按钮-添加是否需要选中数据校验及实现Http方式扩展 ... 表单-拦截器-实现Http方式扩展 表单-元素-工厂数据隔离功能 表单-动态表单-查询数据默认条件优先级优化 sonar代码优化	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
wynne1005	d6fe718e4c	Merge branch 'dev' into test	5 years ago
汪云昊	edf0b66115	Sonar代码缺陷修复 ... 查询条件优化 拦截器，自定义按钮对外接口实现 表单-功能目录优化 软适配日志优化	5 years ago
钮海涛	efe083a9da	修复版本号	5 years ago
汪云昊	f09159dffa	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	1051b22575	ICS 注册中心监控对象	5 years ago
王杰	c6aefc89e7	test合并dev解决ct	5 years ago
王杰	94fed3b9b2	Merge branch 'test' into dev	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
汪云昊	aeda8d8287	版本调整	5 years ago
汪云昊	3069c5bf18	查询条件补充	5 years ago
汪云昊	ec1d52e7dd	MAVEN 版本控制调整	5 years ago
贾文涛	7106c06221	统一修改pom文件的项目版本问题0331	5 years ago
wynne1005	44696061ee	修改pom文件为最新	5 years ago
wynne1005	d80b341620	还原test pom	5 years ago
贾文涛	048419d823	修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。	5 years ago
曾贞一	779b9d209c	【修改 DEV-pom.xml】	5 years ago
汪云昊	41a39990f4	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	b0a4eccca4	禁用启用，软删	5 years ago
luweihao	12579c7a14	还原pom	5 years ago
王杰	999aae6fc0	解决冲突	5 years ago
曾贞一	2625c2cb0f	【修改 TSET-pom.xml】	5 years ago
汪云昊	a3ecc3132f	表单约束管理	5 years ago
王杰	80ca438ce3	test合并到dev解决pom冲突	5 years ago
曾贞一	5ebb5cbf20	【修改 TSET-pom.xml】	5 years ago
王杰	068a0956db	解决冲突	5 years ago
王杰	b77d3065a4	Merge branch 'test' into dev	5 years ago
汪云昊	a510196022	软删合同禁用启用功能	5 years ago
jenkins	83a9b74c43	Jenkins自动合并	5 years ago
汪云昊	05d6f132ce	表单拾取 ... 任务检查功能优化	5 years ago
王杰	ab68895760	test分支修改pom	5 years ago