wxz
							
						 | 
						
							
							
							
								
							
								fbe00a9b75
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_footbar' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								d500323d83
								
							
								
							
						 | 
						
							
							
								
								修改:flyway脚本版本号修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								4602c620c2
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								0658d49dc4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_footbar' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								e29b1d1546
								
							
								
							
						 | 
						
							
							
								
								删除默认footbar,连带删除所有客户的footbar(生产上不用,测试用)
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								34cfbf6db6
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								41f1cac4fb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_footbar' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								6ef78976f1
								
							
								
							
						 | 
						
							
							
								
								footbar详情增加"defaultPageTilte"的返回
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								9b4c4f5e71
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_footbar' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								8d228f870b
								
							
								
							
						 | 
						
							
							
								
								修复barname判断错误
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								6365b1e401
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								044492c755
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_footbar' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								595aca1e57
								
							
								
							
						 | 
						
							
							
								
								修改:footbar物理删除
							
							
							
							
							
							
								
							
							
							修改:更新footbar信息的时候,name唯一性判断逻辑修改 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								58cb853eca
								
							
								
							
						 | 
						
							
							
								
								版本升级,更新外部应用认证模块
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								1cd6be2170
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								f50739d655
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_externalappauth' into dev_temp
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/externalapp/ExtAppJwtTokenUtils.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								0b6ee2a2ee
								
							
								
							
						 | 
						
							
							
								
								新增:md5摘要验签方式的外部应用认证
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								1e4a524af5
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								ff61e286f8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_footbar' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								16097c9899
								
							
								
							
						 | 
						
							
							
								
								增加:footbar删除功能
							
							
							
							
							
							
								
							
							
							增加:oper运营端查询footbar列表功能
修复:footbar列表增加display新列的返回 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								c5c6c75247
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								14854e26cc
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_footbar' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								94b81f624f
								
							
								
							
						 | 
						
							
							
								
								修改:同步客户的footbar的时候,修改bar存在性验证逻辑
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								22631d5f00
								
							
								
							
						 | 
						
							
							
								
								修改:添加footbar,同步到已经有自定义footbar的客户下
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								28e3ae89bb
								
							
								
							
						 | 
						
							
							
								
								服务升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								2638ebda4d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_plugins' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								352c936f4f
								
							
								
							
						 | 
						
							
							
								
								1、定制功能修改-支持修改功能说明。2.列表查询sql修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								db121410b4
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								9c8f32e048
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_footbar' into dev_temp
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-user/epmet-user-server/pom.xml 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								346a97adfc
								
							
								
							
						 | 
						
							
							
								
								新增:为客户初始化默认的footbar
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								704a495346
								
							
								
							
						 | 
						
							
							
								
								新增footbar维护相关接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								b69d7fae48
								
							
								
							
						 | 
						
							
							
								
								epmet-user
							
							
							
							
							
							
								
							
							
							epmet-point
gov-issue
resi-mine
服务升级 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								4d84b15639
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								a0dcbd07b6
								
							
								
							
						 | 
						
							
							
								
								定制功能上架 - 代码优化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								d87931b8f4
								
							
								
							
						 | 
						
							
							
								
								手动触发议题表决数同步缓存与数据库接口调整,在关闭议题、议题转项目时进行一次缓存同步
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								63f8f10294
								
							
								
							
						 | 
						
							
							
								
								服务升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								d82b148dde
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_plugins' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								1462b7a608
								
							
								
							
						 | 
						
							
							
								
								代码修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								dc44aab8fb
								
							
								
							
						 | 
						
							
							
								
								客户定制功能上架,不能超过12个
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								159c107037
								
							
								
							
						 | 
						
							
							
								
								采集功能添加默认12个功能数限制
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								038fa35e88
								
							
								
							
						 | 
						
							
							
								
								data-report +1   -> 57
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								caedc863fc
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								5d41c26b04
								
							
								
							
						 | 
						
							
							
								
								党员联系群众柱状图接口返参dto设置默认值
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								990a81c5f9
								
							
								
							
						 | 
						
							
							
								
								党员联系群众柱状图接口增加总和
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								c8cbfd5eec
								
							
								
							
						 | 
						
							
							
								
								居民端用户个人信息查询接口调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4581826873
								
							
								
							
						 | 
						
							
							
								
								修改初始化归一算法构造方法
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e5c27345ef
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ea5250d1f9
								
							
								
							
						 | 
						
							
							
								
								添加阈值v1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								a29dbbd554
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ee00f86b5b
								
							
								
							
						 | 
						
							
							
								
								修改初始化归一算法构造方法
							
							
							
							
								
							
							
						 | 
						5 years ago |