zhaoqifeng
							
						 | 
						
							
							
							
								
							
								e03b7adea7
								
							
								
							
						 | 
						
							
							
								
								小区单元楼栋等自动生成代码
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								122c80f830
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_grid_platform' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								46afef7afa
								
							
								
							
						 | 
						
							
							
								
								暂时住掉发送
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								df2e444b19
								
							
								
							
						 | 
						
							
							
								
								调整引用问题
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								f4f7ca03b5
								
							
								
							
						 | 
						
							
							
								
								事件上报修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								f965f9ec62
								
							
								
							
						 | 
						
							
							
								
								解决代码冲突
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								fec2de9c45
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_grid_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								28fde7aa7f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_grid_platform' into dev_grid_platform
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								be0de5d61c
								
							
								
							
						 | 
						
							
							
								
								加字段
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								603bde674e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e018395667
								
							
								
							
						 | 
						
							
							
								
								warn
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								10e3359fae
								
							
								
							
						 | 
						
							
							
								
								emm
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								920b476cad
								
							
								
							
						 | 
						
							
							
								
								项目分类统计修改父客户存在和不存在的分类方法
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								1cf71d92fd
								
							
								
							
						 | 
						
							
							
								
								事件上报添加部门网格ID
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								c5f00e1aac
								
							
								
							
						 | 
						
							
							
								
								事件上报添加部门网格ID
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								6a2c891acf
								
							
								
							
						 | 
						
							
							
								
								错提url修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								2ebfc657f1
								
							
								
							
						 | 
						
							
							
								
								事件上报添加部门网格ID
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								f8eb5a6a3e
								
							
								
							
						 | 
						
							
							
								
								...
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								bae3ba9b2b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_grid_platform' into dev_grid_platform
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/ExDeptDao.java
#	epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/ExDeptEntity.java
#	epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExDeptDao.xml 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								2e8f1b997f
								
							
								
							
						 | 
						
							
							
								
								组织网格数据同步
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								15e1c0bf88
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8f3e2dc521
								
							
								
							
						 | 
						
							
							
								
								暂时放开error
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								32bd1cbde9
								
							
								
							
						 | 
						
							
							
								
								事件上报添加部门网格ID
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7c58ab9c19
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								7497421203
								
							
								
							
						 | 
						
							
							
								
								事件上报添加部门网格ID
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								4766365f75
								
							
								
							
						 | 
						
							
							
								
								事件上报
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								21733738da
								
							
								
							
						 | 
						
							
							
								
								办结组织和办结层级设定
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								073f1aa456
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'wxz_senseless_deploy' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								a84edc743b
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_dim_addcode' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								eb0a132da2
								
							
								
							
						 | 
						
							
							
								
								事件上报发送MQ消息
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								39ead8e4e4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_grid_platform' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7ef6da082b
								
							
								
							
						 | 
						
							
							
								
								优化结构
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5112c82c8b
								
							
								
							
						 | 
						
							
							
								
								sql错误
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								298969b1cf
								
							
								
							
						 | 
						
							
							
								
								去掉逻辑删除
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								5480c8037f
								
							
								
							
						 | 
						
							
							
								
								修改:
							
							
							
							
							
							
								
							
							
							1.调整 NacosServiceListListenerRegisterer 中部分日志的级别为debug 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b046aa7a69
								
							
								
							
						 | 
						
							
							
								
								代码调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								d8a75638d7
								
							
								
							
						 | 
						
							
							
								
								组织、网格、人员新增、修改出发点添加推送MQ事件逻辑
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								a16da262e5
								
							
								
							
						 | 
						
							
							
								
								sql错误
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								1e36a99f81
								
							
								
							
						 | 
						
							
							
								
								分类截取位数
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								e964b04213
								
							
								
							
						 | 
						
							
							
								
								巡查方法调整并添加初始化数据入口
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								d874a4626d
								
							
								
							
						 | 
						
							
							
								
								新增:
							
							
							
							
							
							
								
							
							
							job扫描滞留/阻塞消息的逻辑 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								19f0ad54bf
								
							
								
							
						 | 
						
							
							
								
								新增:
							
							
							
							
							
							
								
							
							
							job扫描滞留/阻塞消息的逻辑 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								a3e1d3d287
								
							
								
							
						 | 
						
							
							
								
								修复:
							
							
							
							
							
							
								
							
							
							无法编译的代码问题 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								4b66a433d7
								
							
								
							
						 | 
						
							
							
								
								新增:
							
							
							
							
							
							
								
							
							
							system_message_pendding的sql脚本 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								8e24b4205f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_grid_platform' into dev_grid_platform
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								d3f10217fe
								
							
								
							
						 | 
						
							
							
								
								新增:
							
							
							
							
							
							
								
							
							
							1.epmet-message中,扫描"未成功发送到mq的滞留消息"的接口
2.调整mq阻塞消息的key
3.其他逻辑微调 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								8852ce3ebd
								
							
								
							
						 | 
						
							
							
								
								修改:
							
							
							
							
							
							
								
							
							
							dim同步,增加code字段 的同步 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5f4fd78171
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d41212b455
								
							
								
							
						 | 
						
							
							
								
								因为分类还没更新,暂时先按照4位截取
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								e67e0047b2
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago |