wxz
							
						 | 
						
							
							
							
								
							
								5b6d4780c2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_group_edit' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_group_edit
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								595c9ca11d
								
							
								
							
						 | 
						
							
							
								
								临时提交:组信息编辑内容提交
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								4e1e7ef569
								
							
								
							
						 | 
						
							
							
								
								小组变更表Entity属性相关修改,工作端审核变更接口返参入参DTO
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								02338382fe
								
							
								
							
						 | 
						
							
							
								
								临时提交:居民端查询小组详情接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								c3bd497863
								
							
								
							
						 | 
						
							
							
								
								提交 自动生成的文件
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7c04bc7e8c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								a45548c5e2
								
							
								
							
						 | 
						
							
							
								
								组织树修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								5069696731
								
							
								
							
						 | 
						
							
							
								
								组织树修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								e6f38829c2
								
							
								
							
						 | 
						
							
							
								
								组织树修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								80dd7f70e0
								
							
								
							
						 | 
						
							
							
								
								组织树修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								c9c78f3f56
								
							
								
							
						 | 
						
							
							
								
								下级指数排行
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								cd418b03bc
								
							
								
							
						 | 
						
							
							
								
								redisson锁
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								633a152671
								
							
								
							
						 | 
						
							
							
								
								修改错误
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								02a634e20e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_common' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								e0e61800c8
								
							
								
							
						 | 
						
							
							
								
								添加客户端Ip
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								781dae5c92
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_footbar_cache' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								3f08c4e1fa
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into dev_footbar_cache
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								fef3d60418
								
							
								
							
						 | 
						
							
							
								
								无参构造函数
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								52ca934a7d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_thirdplatform' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								4208adc393
								
							
								
							
						 | 
						
							
							
								
								党支部新接口添加
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								cbda379962
								
							
								
							
						 | 
						
							
							
								
								代码模板管理
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								fbffc6be9c
								
							
								
							
						 | 
						
							
							
								
								党支部新接口添加
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								0b62e94359
								
							
								
							
						 | 
						
							
							
								
								党支部新接口添加
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								0195e7ec54
								
							
								
							
						 | 
						
							
							
								
								调整内外部认证,支持同时使用内外部认证
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								2176fa35e4
								
							
								
							
						 | 
						
							
							
								
								党支部新接口添加
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								ccd91e28ea
								
							
								
							
						 | 
						
							
							
								
								党支部新接口添加
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								2822de7c57
								
							
								
							
						 | 
						
							
							
								
								党支部新接口添加
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								01b9373440
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								39bc9f6f4c
								
							
								
							
						 | 
						
							
							
								
								党支部新接口添加
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								02915fc883
								
							
								
							
						 | 
						
							
							
								
								党员认证提交记录校验去除网格Id,如果居民在一个网格下申请了党员,在其余网格不能再次申请党员。
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								0bc88795f4
								
							
								
							
						 | 
						
							
							
								
								党支部新接口添加
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								bd480623df
								
							
								
							
						 | 
						
							
							
								
								党支部新接口添加
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								92e24b68cc
								
							
								
							
						 | 
						
							
							
								
								党支部新接口添加
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								bfe8058437
								
							
								
							
						 | 
						
							
							
								
								按客户查询模板Id列表
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								e3524400a1
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								ca1128f375
								
							
								
							
						 | 
						
							
							
								
								备注修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								e1e9ec5f1e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								ca48ac6fa5
								
							
								
							
						 | 
						
							
							
								
								项目详情修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								1d81408cf4
								
							
								
							
						 | 
						
							
							
								
								党支部分布,用户分布,党员分布 调整显示智慧社区要显示的
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								9f3ee08553
								
							
								
							
						 | 
						
							
							
								
								添加注释
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								1949da956b
								
							
								
							
						 | 
						
							
							
								
								五级指标原始值 添加权重
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								23d4e4a8ca
								
							
								
							
						 | 
						
							
							
								
								项目详情
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								ed2739ae60
								
							
								
							
						 | 
						
							
							
								
								项目详情
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								3007f286f1
								
							
								
							
						 | 
						
							
							
								
								项目详情
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b943131d11
								
							
								
							
						 | 
						
							
							
								
								本级及下级 乘以权重
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								a5915b1196
								
							
								
							
						 | 
						
							
							
								
								项目详情
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								328a76a173
								
							
								
							
						 | 
						
							
							
								
								项目详情
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ce6613c174
								
							
								
							
						 | 
						
							
							
								
								数据中乘以权重
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								1625f7969e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								f0ce88c099
								
							
								
							
						 | 
						
							
							
								
								区划限制显示
							
							
							
							
								
							
							
						 | 
						5 years ago |