jianjun
							
						 | 
						
							
							
							
								
							
								ed542f696f
								
							
								
							
						 | 
						
							
							
								
								修改错误
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7d1af6c758
								
							
								
							
						 | 
						
							
							
								
								部署statis report user ext
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								50d5896ced
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								9127e2163b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-gateway/pom.xml
#	epmet-module/epmet-ext/epmet-ext-server/pom.xml
#	epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
#	epmet-module/epmet-third/epmet-third-server/pom.xml
#	epmet-module/gov-access/gov-access-server/pom.xml
#	epmet-module/oper-customize/oper-customize-server/pom.xml
#	epmet-user/epmet-user-server/pom.xml 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								68595ca048
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7d0166487e
								
							
								
							
						 | 
						
							
							
								
								test
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								3635f20262
								
							
								
							
						 | 
						
							
							
								
								指标汇总计算
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a7d133004f
								
							
								
							
						 | 
						
							
							
								
								客户定制功能角色设置、查询;居民端、工作端角色列表查询
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								bc73413f51
								
							
								
							
						 | 
						
							
							
								
								完成外部应用-内部客户管理
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								3b07723a55
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								fee3523582
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ea046f3dd1
								
							
								
							
						 | 
						
							
							
								
								组织内党员的参与议事能力考评分(平均值)index_code修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a3022879d3
								
							
								
							
						 | 
						
							
							
								
								区直selectExtremeValue sql修改v2
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								170f7bf2ba
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								de648c295f
								
							
								
							
						 | 
						
							
							
								
								区直selectExtremeValue sql修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								0a9196025a
								
							
								
							
						 | 
						
							
							
								
								类型修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								2011c75559
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into dev_externalappauth
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								69da1bedee
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/release'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								11a4d6b345
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into release
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								37e731a9f6
								
							
								
							
						 | 
						
							
							
								
								user    ext     dev服务升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								03d414f733
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_plugins' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								9794b400ec
								
							
								
							
						 | 
						
							
							
								
								代码优化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								531a920e20
								
							
								
							
						 | 
						
							
							
								
								客户定制功能角色设置代码生成
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								3de10a1564
								
							
								
							
						 | 
						
							
							
								
								外部应用管理增加内部客户ing
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								eabe563d14
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								06f4449d9c
								
							
								
							
						 | 
						
							
							
								
								删除无用方法
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								b0a26d211c
								
							
								
							
						 | 
						
							
							
								
								社区、街道、全区修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								1ab0e0c32c
								
							
								
							
						 | 
						
							
							
								
								添加明细 相关性字段
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								a5eb4ea7bf
								
							
								
							
						 | 
						
							
							
								
								添加明细 相关性字段
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								6ad06926ef
								
							
								
							
						 | 
						
							
							
								
								年表-月表,访问数据库次数优化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								c83d5c7d0a
								
							
								
							
						 | 
						
							
							
								
								对外接口,查询机关、部门、网格下工作人员,范围从“不包括未激活和被禁用的”调整成“不包括被禁用的”
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								350333606c
								
							
								
							
						 | 
						
							
							
								
								全区相关
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								bcfb1adb92
								
							
								
							
						 | 
						
							
							
								
								年表、月表 -- 展示接口优化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								e704015459
								
							
								
							
						 | 
						
							
							
								
								年表、月表收尾
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								d5e8e3f419
								
							
								
							
						 | 
						
							
							
								
								代码还原
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								e5be626a93
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_screen_data' of C:\Users\Administrator\Desktop\党群e事通后端 with conflicts.
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								945ab756f0
								
							
								
							
						 | 
						
							
							
								
								社区相关
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								70fcf916d3
								
							
								
							
						 | 
						
							
							
								
								OPER_EXT_APP_SECRET_RESET_FAIL 8713
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								da10ffe6b6
								
							
								
							
						 | 
						
							
							
								
								难点堵点、党建能力、党员相关代码提交v2
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d631b3e94a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8269770456
								
							
								
							
						 | 
						
							
							
								
								难点堵点、党建能力、党员相关代码提交
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b9ece9bf47
								
							
								
							
						 | 
						
							
							
								
								添加日志
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								bf1870f388
								
							
								
							
						 | 
						
							
							
								
								人员调动对自己操作
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								31a7f370f1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/release'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								0fb2a60957
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into release
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								6f2cb95f27
								
							
								
							
						 | 
						
							
							
								
								third服务升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								42879bcb37
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_thirdplatform' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								dabb4e18d0
								
							
								
							
						 | 
						
							
							
								
								按钮授权 变更 扫码授权
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c432b44ead
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a489745784
								
							
								
							
						 | 
						
							
							
								
								区直部门添加注解
							
							
							
							
								
							
							
						 | 
						5 years ago |