wxz
							
						 | 
						
							
							
							
								
							
								d856a33edb
								
							
								
							
						 | 
						
							
							
								
								1.修改:居民信息导入,只更新已填写的、(意思就是,上次我填了第一列第二列,提交了。这次我只填了第三第四列,第一第二列空着,那这次我导入之后4列都有值,而不是把1,2列更新为空)
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								7b684d485f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								eae97f663f
								
							
								
							
						 | 
						
							
							
								
								场所类型、场所类别不设置示例
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a895977559
								
							
								
							
						 | 
						
							
							
								
								规模请正确填写场所人数;模板增加示例
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								12851dcae5
								
							
								
							
						 | 
						
							
							
								
								修复安全生产巡查导入,场所区域为网格名称
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b8d818824c
								
							
								
							
						 | 
						
							
							
								
								修复安全生产巡查导入,规模必须填入数字。
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b39fe4bb2e
								
							
								
							
						 | 
						
							
							
								
								修复安全生产巡查,拟复查时间不能置空,且自动带入的问题
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8864442f8e
								
							
								
							
						 | 
						
							
							
								
								信息采集审核bug修改:暂存一下,要去改别的bug了
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								luyan
							
						 | 
						
							
							
							
								
							
								6678154471
								
							
								
							
						 | 
						
							
							
								
								社区服务,修改公共服务管理排序规则,依据服务事件倒序;
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								01117e768b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'wxz_bug_fix'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								ec1c4dba4b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'wxz_bug_fix'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								2f22870337
								
							
								
							
						 | 
						
							
							
								
								代码写法调整,不重要
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								2c00e196af
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'wxz_bug_fix'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								e731e686b8
								
							
								
							
						 | 
						
							
							
								
								fix:解决居民信息多选导致的一系列问题。。。。头发掉光了
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								e202417a9d
								
							
								
							
						 | 
						
							
							
								
								fix:居民信息导出
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								89cb57abfa
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'wxz_bug_fix'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								14fa4f64a1
								
							
								
							
						 | 
						
							
							
								
								fix:初始化"指挥调度"的时候,将sql中缺少的字段补全
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								bc90dcd82d
								
							
								
							
						 | 
						
							
							
								
								fix:居民信息导出-gridIds
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								9d4aa553be
								
							
								
							
						 | 
						
							
							
								
								fix:居民信息导出-staffOrgPaths
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								8bb9e3efd2
								
							
								
							
						 | 
						
							
							
								
								修改:居民信息-所属房屋(小区列表),根据所属组织调整为多选,将接口也修改为支持agencyIds/gridIds
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								a8d531ea20
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'wxz_bug_fix'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								784551dd0b
								
							
								
							
						 | 
						
							
							
								
								修复:1.ic_event,事件处理分析查询中,缺少del_flag='0'的bug
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								4a04905845
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								aaaad8ce70
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/房屋tree_yzm'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								87a8ad5fc8
								
							
								
							
						 | 
						
							
							
								
								登录或者退出content不一致
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								cca2afca31
								
							
								
							
						 | 
						
							
							
								
								/heart/icpartyactivity/search
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8cca427146
								
							
								
							
						 | 
						
							
							
								
								search
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3542f686f5
								
							
								
							
						 | 
						
							
							
								
								/sys/log/operation/page去掉orgIdPath
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								028537f34f
								
							
								
							
						 | 
						
							
							
								
								/sys/log/operation/page去掉orgIdPath
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c991992e82
								
							
								
							
						 | 
						
							
							
								
								工作端小程序退出增加操作日志;数字社区登录退出增加操作日志
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9c714a4026
								
							
								
							
						 | 
						
							
							
								
								/epmetuser/dataSyncRecordDisability/detail/调整,删除居民增加逻辑
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								75b8c1572d
								
							
								
							
						 | 
						
							
							
								
								/epmetuser/dataSyncRecordDisability/detail/调整,删除居民增加逻辑
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								eb4f51bd64
								
							
								
							
						 | 
						
							
							
								
								/epmetuser/dataSyncRecordDisability/detail/1585903730961670146
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d54774f504
								
							
								
							
						 | 
						
							
							
								
								/epmetuser/dataSyncRecordDisability/detail/1585903730961670146
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d8903e3424
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/房屋tree_yzm'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								82eec85a7a
								
							
								
							
						 | 
						
							
							
								
								upsertTagCount
							
							
							
							
							
							
								
							
							
							and del_flag='0' 
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9ddd181564
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/房屋tree_yzm'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2a1cc473a6
								
							
								
							
						 | 
						
							
							
								
								/auth/login/captcha/{uuid},文字版验证码
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d4afcaf9ab
								
							
								
							
						 | 
						
							
							
								
								epmetuser/statsresiwarn/list支持传入多个小区,
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9a5db5ac8a
								
							
								
							
						 | 
						
							
							
								
								epmetuser/statsresiwarn/list支持传入多个小区,
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								13ca7651e8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/房屋tree_yzm'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f4deeefe28
								
							
								
							
						 | 
						
							
							
								
								新增小区烟台客户id,不生成二维码
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								80a12b2f0d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/房屋tree_yzm'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7f7c02e3eb
								
							
								
							
						 | 
						
							
							
								
								/sys/log/operation/page
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c4c88d051e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/房屋tree_yzm'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								cb3b3fcc11
								
							
								
							
						 | 
						
							
							
								
								操作记录,脱敏记录targetId
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e0fb48a4ba
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/房屋tree_yzm'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								56a15091cc
								
							
								
							
						 | 
						
							
							
								
								让李小康执行sql
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1ce84cf1b0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/房屋tree_yzm'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								99be2c8f65
								
							
								
							
						 | 
						
							
							
								
								user_badge_certificate_record增加agency_id
							
							
							
							
								
							
							
						 | 
						3 years ago |