zxc
							
						 | 
						
							
							
							
								
							
								1414888249
								
							
								
							
						 | 
						
							
							
								
								注释
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								be3c7dc372
								
							
								
							
						 | 
						
							
							
								
								添加参数
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								38397a605a
								
							
								
							
						 | 
						
							
							
								
								房屋导入暂提
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2e346ab5ef
								
							
								
							
						 | 
						
							
							
								
								是否
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								11ff0e4433
								
							
								
							
						 | 
						
							
							
								
								id类型
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								3134a60805
								
							
								
							
						 | 
						
							
							
								
								主线程里创建子线程调用feign接口,通过header消息头带token信息方式
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								c554be8b0b
								
							
								
							
						 | 
						
							
							
								
								房屋导入暂提
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								888419fe1e
								
							
								
							
						 | 
						
							
							
								
								dynamicQuery
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6782ddd2b4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev' into dev_optimize_query
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcStatsResiWarnDao.java
#	epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								413af387af
								
							
								
							
						 | 
						
							
							
								
								fangwuID
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								a03ca03f47
								
							
								
							
						 | 
						
							
							
								
								房屋ID
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								55ba9b5b71
								
							
								
							
						 | 
						
							
							
								
								emm
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								afbfb6cbf5
								
							
								
							
						 | 
						
							
							
								
								房屋导入通用DTO
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								20b5defc53
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								c082ebafe4
								
							
								
							
						 | 
						
							
							
								
								获取项目节点耗时信息SQL改造
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								4922ee5707
								
							
								
							
						 | 
						
							
							
								
								修改:
							
							
							
							
							
							
								
							
							
							1.居民信息导入:将数据分多批次导入,减少内存占用 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								444c837fdc
								
							
								
							
						 | 
						
							
							
								
								9999替换为统一错误码
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								f9ef9e267e
								
							
								
							
						 | 
						
							
							
								
								房屋信息导入
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								57e040415b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_grid_lively_syc' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								b3432601c3
								
							
								
							
						 | 
						
							
							
								
								程序优化
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								fa0058664b
								
							
								
							
						 | 
						
							
							
								
								导入去掉图片
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								f50aa552b9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_grid_lively_syc' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								c946e16237
								
							
								
							
						 | 
						
							
							
								
								查询条件调整,按dateId筛选数据
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9057033ef0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_addcate_and_import' into dev_addcate_and_import
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5d54b5effd
								
							
								
							
						 | 
						
							
							
								
								党员风采导入导出添加所属分类名称
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								93e70100cb
								
							
								
							
						 | 
						
							
							
								
								louyu
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								7fe3feb239
								
							
								
							
						 | 
						
							
							
								
								赋能平台 人员调动模块 18类别sql写死问题调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								04d5d026c8
								
							
								
							
						 | 
						
							
							
								
								小区信息导入关联物业
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								4236964b37
								
							
								
							
						 | 
						
							
							
								
								小区信息导入排除重复名
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								840f3dab79
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_addcate_and_import' into dev_addcate_and_import
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								ad96489c99
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1118785559
								
							
								
							
						 | 
						
							
							
								
								党员风采
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								420203339c
								
							
								
							
						 | 
						
							
							
								
								like错误
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								ebf42fef4f
								
							
								
							
						 | 
						
							
							
								
								获取项目节点耗时信息SQL改造
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								691b65179d
								
							
								
							
						 | 
						
							
							
								
								小区信息导入
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								adae025ffc
								
							
								
							
						 | 
						
							
							
								
								人员预警漏洞里面 直接限制最多1000 要不然前端显示不了
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2edc1236ef
								
							
								
							
						 | 
						
							
							
								
								风采分类
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4b5f6d65ab
								
							
								
							
						 | 
						
							
							
								
								居民类别分析中 优化查询 pids like 错误
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								190693e320
								
							
								
							
						 | 
						
							
							
								
								优化程序
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								fe3f5c682a
								
							
								
							
						 | 
						
							
							
								
								居民类别分析中 优化查询 空指针判断
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								91406709ad
								
							
								
							
						 | 
						
							
							
								
								网格活跃度查询统计初版
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								e9ff18cd60
								
							
								
							
						 | 
						
							
							
								
								居民类别分析中 优化查询
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c3f83a820e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e1ac737788
								
							
								
							
						 | 
						
							
							
								
								新增楼宇是户数名词改为总户数,左边树无需计算总户数。
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								fe64517809
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								5ed02f594b
								
							
								
							
						 | 
						
							
							
								
								修复:
							
							
							
							
							
							
								
							
							
							1.导入的时候发生调动动作,附加信息表中有数据时产生多余类别变更记录的bug 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4dfa3cfa31
								
							
								
							
						 | 
						
							
							
								
								调大 agg和report
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b0a0c1df6c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								18b427adcc
								
							
								
							
						 | 
						
							
							
								
								orgId
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e8b2168069
								
							
								
							
						 | 
						
							
							
								
								error
							
							
							
							
								
							
							
						 | 
						4 years ago |