wxz
							
						 | 
						
							
							
							
								
							
								acd819d50a
								
							
								
							
						 | 
						
							
							
								
								1.版本升级,发布角色默认权限及其范围配置的功能
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								fe275f13df
								
							
								
							
						 | 
						
							
							
								
								1.增加日志切面
							
							
							
							
							
							
								
							
							
							2.修改compose错误,调整资源配置 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								cf67f15c7a
								
							
								
							
						 | 
						
							
							
								
								网格小组
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								d976615706
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								2cf6882197
								
							
								
							
						 | 
						
							
							
								
								1.增加角色及其默认权限相关配置
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								136aaf6186
								
							
								
							
						 | 
						
							
							
								
								网格小组修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9af6b2ce97
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_data_stats' into dev_data_stats
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f1a1b861f4
								
							
								
							
						 | 
						
							
							
								
								修改LoginUserDetailsResultDTO注释
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6bc4dca651
								
							
								
							
						 | 
						
							
							
								
								调整判断
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								738f97c29b
								
							
								
							
						 | 
						
							
							
								
								宣传能力统计代码暂存
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								75829224fa
								
							
								
							
						 | 
						
							
							
								
								数据首页
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								7968b940bb
								
							
								
							
						 | 
						
							
							
								
								网格小组
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								90d304075e
								
							
								
							
						 | 
						
							
							
								
								宣传能力-标签使用次数统计 暂存
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								be61ba7a57
								
							
								
							
						 | 
						
							
							
								
								govorg服务升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								726abed1bd
								
							
								
							
						 | 
						
							
							
								
								数据-项目-网格日、月统计代码提交
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5e310f7595
								
							
								
							
						 | 
						
							
							
								
								支部管理体验版发布
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								4b4491588c
								
							
								
							
						 | 
						
							
							
								
								查询agency的所有下级网格Id逻辑修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								3823da70af
								
							
								
							
						 | 
						
							
							
								
								用户数据统计逻辑
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9ef43c26f2
								
							
								
							
						 | 
						
							
							
								
								govgrid、resipartymember服务
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b401510b9a
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_partybranch' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_partybranch
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e6ef7d778c
								
							
								
							
						 | 
						
							
							
								
								支部管理:注册党员自动匹配成功、人工审核是党员,新增partymember_auth_record
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								2757fb7ef8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								ab6ecaf06d
								
							
								
							
						 | 
						
							
							
								
								1.调整:初始化客户操作,"为客户初始化数据权限范围"动作调整,操作的数据权限范围不再统一,同一个操作在不同的角色下将有不同的范围
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								addfd6405c
								
							
								
							
						 | 
						
							
							
								
								支部管理添加党员,校验身份证号,判断性别
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								65ea28dd76
								
							
								
							
						 | 
						
							
							
								
								功能key name修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6a67357701
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_partybranch' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								24a924b1dd
								
							
								
							
						 | 
						
							
							
								
								党员身份证号校验
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								e36a405956
								
							
								
							
						 | 
						
							
							
								
								数据-项目-机关日、月统计程序逻辑调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								951bfbf753
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_bugfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								80ad274a44
								
							
								
							
						 | 
						
							
							
								
								1.优化维度初始化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f45951afbf
								
							
								
							
						 | 
						
							
							
								
								govgrid、resi-party升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								28e2be5cef
								
							
								
							
						 | 
						
							
							
								
								1.解决冲突
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								02b4733554
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_data_stats' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_data_stats
							
							
							
							
							
							
								
							
							
							 Conflicts:
	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDemoServiceImpl.java
	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimAgencyServiceImpl.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								fd120e70c6
								
							
								
							
						 | 
						
							
							
								
								1.修改:使用DimRobot
							
							
							
							
							
							
								
							
							
							2.修改:MetaObjectField的生成规则 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4ca3633f40
								
							
								
							
						 | 
						
							
							
								
								宣传能力统计暂存
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a308119dc4
								
							
								
							
						 | 
						
							
							
								
								govgrid、resi-party升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								49438861b3
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_partybranch' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_partybranch
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								dfc8411b04
								
							
								
							
						 | 
						
							
							
								
								ResiPartyMemberOpenFeignClient添加url
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2c297086d8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_partybranch' into dev_partybranch
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ce7b567db8
								
							
								
							
						 | 
						
							
							
								
								支部管理:查看党员详情接口修改v2
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								69d01daaf5
								
							
								
							
						 | 
						
							
							
								
								宣传能力统计暂存
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								021d2fea56
								
							
								
							
						 | 
						
							
							
								
								govgrid升级0.3.33
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								fb6f5efd8b
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_partybranch' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_partybranch
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d1f07939c0
								
							
								
							
						 | 
						
							
							
								
								支部管理:查看党员详情接口修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8651575bbc
								
							
								
							
						 | 
						
							
							
								
								govaccess注册到nacos
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								943d22626e
								
							
								
							
						 | 
						
							
							
								
								支部管理联调1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d5d291ed12
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev_partybranch', 'dev' and 'dev_partybranch' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_partybranch
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								791e551ada
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_bugfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								798de2a7ef
								
							
								
							
						 | 
						
							
							
								
								支部管理v3:党支部列表添加总人数返参
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								a52a0e2c2e
								
							
								
							
						 | 
						
							
							
								
								1.删除无用demo
							
							
							
							
								
							
							
						 | 
						5 years ago |