yinzuomei
							
						 | 
						
							
							
							
								
							
								345e2e7a9f
								
							
								
							
						 | 
						
							
							
								
								bug#2803,修改房屋名后社区查询和居民信息列表展示
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c6af9dc7f6
								
							
								
							
						 | 
						
							
							
								
								dev合并下来
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								0fbb925b63
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev' into dev_optimize
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								7b61020ac6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								4a70fab897
								
							
								
							
						 | 
						
							
							
								
								房屋导入
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								15bfc86987
								
							
								
							
						 | 
						
							
							
								
								添加公司私服地址 及发布配置
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4b1f3633b3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								09f8f47bb3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5509da011a
								
							
								
							
						 | 
						
							
							
								
								错误信息
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								9a2e8b31f8
								
							
								
							
						 | 
						
							
							
								
								修改单元数bug
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								9099476b61
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								87815a3c75
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_optimize' into dev_optimize
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								88aa2df22a
								
							
								
							
						 | 
						
							
							
								
								改来改去
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								973358befb
								
							
								
							
						 | 
						
							
							
								
								2行程上报
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								59635d54ee
								
							
								
							
						 | 
						
							
							
								
								有重点区域行程
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								a20562d78b
								
							
								
							
						 | 
						
							
							
								
								楼栋编辑单元数时,从头开始新增单元,如果原先已存在,则略过
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								da43e67353
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_optimize' into dev_optimize
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								555bd39d1a
								
							
								
							
						 | 
						
							
							
								
								有重点区域行程
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								77624199ac
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_optimize' into dev_optimize
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b50690c8cd
								
							
								
							
						 | 
						
							
							
								
								注解没用
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d36dc41c8a
								
							
								
							
						 | 
						
							
							
								
								feign引用了
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								1c029afe8f
								
							
								
							
						 | 
						
							
							
								
								删除无用的
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2433ffe780
								
							
								
							
						 | 
						
							
							
								
								删除无用的
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								818ed7eaea
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_optimize' into dev_optimize
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								768664bb95
								
							
								
							
						 | 
						
							
							
								
								房屋导出再次调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								d29939299b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								23fecfa3a6
								
							
								
							
						 | 
						
							
							
								
								错误信息具体化
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								01cc1692ab
								
							
								
							
						 | 
						
							
							
								
								楼宇-》楼栋
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								e69fe13947
								
							
								
							
						 | 
						
							
							
								
								删除无用代码
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								5c91f43ab9
								
							
								
							
						 | 
						
							
							
								
								-
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								a3cfc504c1
								
							
								
							
						 | 
						
							
							
								
								居民信息导入:校验所有列的必填;只校验第一次出现的填了但系统中找不到的列
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								6752d439ae
								
							
								
							
						 | 
						
							
							
								
								居民信息导入:提示话术修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								7723cc8c08
								
							
								
							
						 | 
						
							
							
								
								居民信息导入:修改对必填项的校验判断逻辑和提示逻辑
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								ec7658f713
								
							
								
							
						 | 
						
							
							
								
								更改rentFlagKey的类型
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								d8f38290fa
								
							
								
							
						 | 
						
							
							
								
								build改building
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								11aeb5c971
								
							
								
							
						 | 
						
							
							
								
								联建活动添加网格
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								44adc5c930
								
							
								
							
						 | 
						
							
							
								
								修正错误代码
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								49189eeee7
								
							
								
							
						 | 
						
							
							
								
								@ServletComponentScan注解指定basePackages的参数,个别服务的启动类太深,扫描不到common包中的filter
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								21e2e02e06
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								38f340b37c
								
							
								
							
						 | 
						
							
							
								
								菜单放缓存加强判断 避免空的被放进缓存
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c2fe0cb04f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b7993edeef
								
							
								
							
						 | 
						
							
							
								
								上报网格员数据
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								c269a4ac25
								
							
								
							
						 | 
						
							
							
								
								【Nacos服务列表刷新监听】日志级别变为debug
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c39b0f56eb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								aab611f28a
								
							
								
							
						 | 
						
							
							
								
								修改日志级别
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								732300a19f
								
							
								
							
						 | 
						
							
							
								
								略微调整房屋导入
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								49bdf6abe7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_optimize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_optimize
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								e6b76f6019
								
							
								
							
						 | 
						
							
							
								
								增加:"居民信息-是否租户/流动人口".sql脚本和IcResiUserTableEnum枚举
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								2bad2430fc
								
							
								
							
						 | 
						
							
							
								
								增加:"居民信息-是否租户/流动人口".sql脚本和IcResiUserTableEnum枚举
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								bf7f830bbc
								
							
								
							
						 | 
						
							
							
								
								联建活动添加网格
							
							
							
							
								
							
							
						 | 
						4 years ago |