zhangyuan
							
						 | 
						
							
							
							
								
							
								29a925e6ce
								
							
								
							
						 | 
						
							
							
								
								新版增加
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								47e40e6059
								
							
								
							
						 | 
						
							
							
								
								登陆验证方法追加
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								10a3dfaefd
								
							
								
							
						 | 
						
							
							
								
								bug
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								293cf49010
								
							
								
							
						 | 
						
							
							
								
								增加错误信息
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								a85cbb8986
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								379e9e27bb
								
							
								
							
						 | 
						
							
							
								
								修改类名和注释
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								fc3d1ab3f3
								
							
								
							
						 | 
						
							
							
								
								bug
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								7cb50e6848
								
							
								
							
						 | 
						
							
							
								
								第二个登录接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								aac7da2598
								
							
								
							
						 | 
						
							
							
								
								no message
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								a234a27c5a
								
							
								
							
						 | 
						
							
							
								
								账号密码登录
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d2a87b6a57
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								a7cf616705
								
							
								
							
						 | 
						
							
							
								
								更新居民 类别数据 和 更新房屋内居民 使用定时任务同步
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2fc4c03955
								
							
								
							
						 | 
						
							
							
								
								更新居民 类别数据 和 更新房屋内居民 使用定时任务同步
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4944932d09
								
							
								
							
						 | 
						
							
							
								
								更新居民 类别数据 和 更新房屋内居民 使用定时任务同步
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								db25cf00b2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								cb880d510f
								
							
								
							
						 | 
						
							
							
								
								注掉更新房屋内的居民数 这个压力太大 待优化
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								68466fd760
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								73e1d4fa01
								
							
								
							
						 | 
						
							
							
								
								更新小区时需要更新对应的小区里的居民
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c577c1696b
								
							
								
							
						 | 
						
							
							
								
								listresi,groupby换下位置
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								845a89b45f
								
							
								
							
						 | 
						
							
							
								
								更新小区时需要更新对应的小区里的居民
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								74ee47f64e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ef48136aea
								
							
								
							
						 | 
						
							
							
								
								更新居民的网格id 是小区修改所属网格触发
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								074470bdd6
								
							
								
							
						 | 
						
							
							
								
								更新居民的网格id 是小区修改所属网格触发
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								1d8491f1fd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java 
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ed89bff32e
								
							
								
							
						 | 
						
							
							
								
								更新居民的网格id 是小区修改所属网格触发
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								a99e1e8703
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev_bugfix_ljj' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								56e60425a0
								
							
								
							
						 | 
						
							
							
								
								-
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								ea663d7deb
								
							
								
							
						 | 
						
							
							
								
								修改:【小区编辑】【居民编辑】【居民导入】增加客户级别分布式锁,不能同时进行
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c7b8e07ce3
								
							
								
							
						 | 
						
							
							
								
								添加分布式锁
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								391fafc0ea
								
							
								
							
						 | 
						
							
							
								
								事件管理转需求时不在需要分类
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								958737e5cf
								
							
								
							
						 | 
						
							
							
								
								事件管理转需求时不在需要分类
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								685a7b1a92
								
							
								
							
						 | 
						
							
							
								
								分支错误
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								631948af9a
								
							
								
							
						 | 
						
							
							
								
								事件管理转需求 分类改为非必填
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								4f28800d4c
								
							
								
							
						 | 
						
							
							
								
								修复:compose文件错误
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								77e6ec1e07
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3ff69b5375
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7947d17fc7
								
							
								
							
						 | 
						
							
							
								
								物理删除试试
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								5ea78330f4
								
							
								
							
						 | 
						
							
							
								
								调整:【控制台日志】修改logback-base.xml,避免生成spring.log文件
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								ca60bc1cb5
								
							
								
							
						 | 
						
							
							
								
								调整:【docker-compose】日志滚动配置测试
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								b0eb7bdbbe
								
							
								
							
						 | 
						
							
							
								
								调整:【docker-compose】日志滚动配置测试
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								YUJT
							
						 | 
						
							
							
							
								
							
								44618c623f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/teamB_zz_wgh_1'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								YUJT
							
						 | 
						
							
							
							
								
							
								248885397a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/teamB_shuangshi'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								b3139e2307
								
							
								
							
						 | 
						
							
							
								
								事件上报优化
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								03dd61f514
								
							
								
							
						 | 
						
							
							
								
								事件上报优化
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								dfe7f3c7c9
								
							
								
							
						 | 
						
							
							
								
								我的信息添加是否显示家庭字段
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								3d288eac55
								
							
								
							
						 | 
						
							
							
								
								修改变更记录的isUserId
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								14a76e9788
								
							
								
							
						 | 
						
							
							
								
								修改sql
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								9fa96a869a
								
							
								
							
						 | 
						
							
							
								
								添加时间
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								ed52bb4010
								
							
								
							
						 | 
						
							
							
								
								添加变更记录
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								4c11daab16
								
							
								
							
						 | 
						
							
							
								
								添加变更记录
							
							
							
							
								
							
							
						 | 
						3 years ago |