|  wei.peng | b382c5ae00 | Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test # Conflicts:
#	modules/i3plus-core-api/pom.xml
#	modules/i3plus-core-apiservice/pom.xml
#	modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
#	modules/i3plus-core-apiservice/src/main/resources/application-test.properties
#	pom.xml | 7 years ago | 
				
					
						|  wei.peng | fcc97cb438 | 发布 正式版本 1.0 | 7 years ago | 
				
					
						|  yunhao.wang | 74c78570ed | 项目pom版本更新为dev | 7 years ago | 
				
					
						|  yunhao.wang | 7a0657665e | Merge remote-tracking branch 'origin/master' | 7 years ago | 
				
					
						|  yunhao.wang | a57c4ee19e | Excel导入导出 | 7 years ago | 
				
					
						|  wei.peng | 402bca0a8c | 代码优化 | 7 years ago | 
				
					
						|  wei.peng | 6a521dee37 | 异常处理优化 | 7 years ago | 
				
					
						|  wei.peng | 9bf2152762 | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core | 7 years ago | 
				
					
						|  wei.peng | 28b17c83a6 | 功能代码优化 | 7 years ago | 
				
					
						|  yunhao.wang | 5b154b40df | 字典管理优化 | 7 years ago | 
				
					
						|  yunhao.wang | 3840dea649 | 功能细节调整 | 7 years ago | 
				
					
						|  yunhao.wang | b5fcc65f99 | Merge remote-tracking branch 'origin/master' # Conflicts:
#	modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMessageService.java
#	modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java
#	modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MailQueueReceiver.java
#	modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java | 7 years ago | 
				
					
						|  yunhao.wang | da1c50f9a0 | 用户消息 websocket | 7 years ago | 
				
					
						|  yunhao.wang | c9ef53ef80 | 定时任务 单号生成规则 | 7 years ago | 
				
					
						|  wei.peng | 53b0b86130 | 功能代码优化 | 7 years ago | 
				
					
						|  wei.peng | 22f9126b2c | 自动填充信息Bug 修复 | 7 years ago | 
				
					
						|  yunhao.wang | 0c69ad329c | 消息管理封装 | 7 years ago | 
				
					
						|  yunhao.wang | e1f7b6dea0 | 消息队列调整 系统参数管理
数据初始化文件 | 7 years ago | 
				
					
						|  yunhao.wang | e093c5c6d7 | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core | 7 years ago | 
				
					
						|  yunhao.wang | 42aaa4ba29 | 单号生成规则 邮件配置信息来源改为系统配置信息 | 7 years ago | 
				
					
						|  wei.peng | 267152a2ad | 1、复杂树 功能完成 | 7 years ago | 
				
					
						|  yunhao.wang | b7500c7324 | 系统资源 批量添加 | 7 years ago | 
				
					
						|  yunhao.wang | 962b18ba1b | Merge branch 'master' of http://git.estsh.com/i3-IMPP/impp-framework # Conflicts:
#	modules/impp-framework-boot/src/main/java/cn/estsh/impp/framework/boot/aspect/LogServiceAspect.java | 7 years ago | 
				
					
						|  wei.peng | 350fcb59dd | 1、更新字段名,更新对象名称 | 7 years ago | 
				
					
						|  wei.peng | 23a6a8a99a | 代码优化 | 7 years ago | 
				
					
						|  yunhao.wang | 3a8be23b6f | 站内信 全部完成 | 7 years ago | 
				
					
						|  yunhao.wang | c2e1417ce1 | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core | 7 years ago | 
				
					
						|  yunhao.wang | d944fd77c1 | 文件丢失撤回 | 7 years ago | 
				
					
						|  wei.peng | 87d694abb6 | 文件丢失找回 | 7 years ago | 
				
					
						|  Silliter | 9d111dfd59 | 单元测试开发工具类新增 | 7 years ago | 
				
					
						|  wei.peng | 04ba139eb6 | 用户登录功能完成 | 7 years ago | 
				
					
						|  wei.peng | 3bce009cfc | 账号管理功能优化 | 7 years ago | 
				
					
						|  yunhao.wang | a1d612a3cd | 系统日志 全部完成 操作日志 全部完成
系统语言 全部完成 | 7 years ago | 
				
					
						|  wei.peng | b69ce2e2e6 | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core | 7 years ago | 
				
					
						|  wei.peng | 925c10da8b | 用户信息拆分 | 7 years ago | 
				
					
						|  yunhao.wang | 0fa2a4c605 | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core # Conflicts:
#	modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java
#	modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java | 7 years ago | 
				
					
						|  yunhao.wang | ae0e8392ac | 系统日志 全部完成 操作日志 全部完成
系统语言 全部完成 | 7 years ago | 
				
					
						|  alwaysfrin | 43770f8bcc | 1,对象hashcode和equals继承父对象 2,主键生成策略优化 | 7 years ago | 
				
					
						|  alwaysfrin | 972b6bc064 | base基类调整 | 7 years ago | 
				
					
						|  wei.peng | 6f852cbd9f | 添加修改密码功能 更新字段 Bug 修复 | 7 years ago | 
				
					
						|  wei.peng | 0083c56363 | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core | 7 years ago | 
				
					
						|  alwaysfrin | fa81fd3d16 | 代码优化调整 | 7 years ago | 
				
					
						|  wei.peng | 8dd831e890 | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core | 7 years ago | 
				
					
						|  wei.peng | 382525b188 | 添加用户获取用户角色关系接口 | 7 years ago | 
				
					
						|  alwaysfrin | b6d8c8f54a | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo # Conflicts:
#	modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogOperateRepository.java | 7 years ago | 
				
					
						|  alwaysfrin | c02b895cc6 | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core | 7 years ago | 
				
					
						|  alwaysfrin | b147e319f7 | 日志分析工具持久化,baserepository优化 | 7 years ago | 
				
					
						|  Silliter | c82331c346 | wms工厂仓库类书写 | 7 years ago | 
				
					
						|  yunhao.wang | c39dff1266 | 字典管理     批量删除 系统信息管理 get结果判断
硬件管理     批量修改状态 | 7 years ago | 
				
					
						|  yunhao.wang | 19714088d2 | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core | 7 years ago |