yinzuomei
							
						 | 
						
							
							
							
								
							
								3942eb034d
								
							
								
							
						 | 
						
							
							
								
								barKey.trim
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3b0d30b014
								
							
								
							
						 | 
						
							
							
								
								syncfootbar4customer
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								296bdbe0ad
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_ui_upgrade' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ui_upgrade
							
							
							
							
							
							
								
							
							
							 Conflicts:
	epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								07823edf01
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'wxz_thread_var_clean' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_thread_var_clean
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								776712c019
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'wxz_feign_exception_show' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_feign_exception_show
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								5df3664c7d
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'wxz_feign_datetime' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_feign_datetime
							
							
							
							
							
							
								
							
							
							 Conflicts:
	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/ExceptionUtils.java 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								20abf657a3
								
							
								
							
						 | 
						
							
							
								
								by
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ab0cd0727f
								
							
								
							
						 | 
						
							
							
								
								JILUREN
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								931bffdcce
								
							
								
							
						 | 
						
							
							
								
								luojishanchu
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1fe596b176
								
							
								
							
						 | 
						
							
							
								
								deletefootbar
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								705c6d573f
								
							
								
							
						 | 
						
							
							
								
								删除、列表查询修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								45ca8c2ea6
								
							
								
							
						 | 
						
							
							
								
								列表查询修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1d1be93b37
								
							
								
							
						 | 
						
							
							
								
								deletefootbar
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7d26c40c1e
								
							
								
							
						 | 
						
							
							
								
								同步
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								10bf8d2cd6
								
							
								
							
						 | 
						
							
							
								
								bugfix
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								09dd551ac8
								
							
								
							
						 | 
						
							
							
								
								updatefootbar
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0b4cc482bf
								
							
								
							
						 | 
						
							
							
								
								sql修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								13b2034753
								
							
								
							
						 | 
						
							
							
								
								Constant.FOOTBAR_PATTERN_KEY_SUFFIX
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3c332f53df
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ui_upgrade' into dev_ui_upgrade
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0d99ee3b96
								
							
								
							
						 | 
						
							
							
								
								小程序footbar查询,运营端配置v1
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								7f58a18520
								
							
								
							
						 | 
						
							
							
								
								待办提醒接口改造
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								bd542f312e
								
							
								
							
						 | 
						
							
							
								
								sql修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								91fec152ab
								
							
								
							
						 | 
						
							
							
								
								Constant.FOOTBAR_PATTERN_KEY_SUFFIX
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								96fd9319c2
								
							
								
							
						 | 
						
							
							
								
								运营端配置footbar显示模式,只有为奇数时,才可以选择浮起模式
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								e000b43a21
								
							
								
							
						 | 
						
							
							
								
								党群议事UI变更设计
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4d31a13cc9
								
							
								
							
						 | 
						
							
							
								
								运营端配置footbar显示模式
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0f06e4c651
								
							
								
							
						 | 
						
							
							
								
								customer_parameter新增footbar相关产品默认key
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8a59d06728
								
							
								
							
						 | 
						
							
							
								
								新增、修改、详情、列表增加入参返参floatIconPath
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								a87ba81c5c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								15b162c8c5
								
							
								
							
						 | 
						
							
							
								
								议题统计修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b1e7540a8f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b47f737c57
								
							
								
							
						 | 
						
							
							
								
								去掉无用注入
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								0acfd76bd6
								
							
								
							
						 | 
						
							
							
								
								去除无用接口入参
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9d0421cfd8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								53b0d9e40f
								
							
								
							
						 | 
						
							
							
								
								/epmet/ext/staff/permissionv2
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								941d038837
								
							
								
							
						 | 
						
							
							
								
								微调
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f68a403ef2
								
							
								
							
						 | 
						
							
							
								
								/epmet/ext/staff/permissionv2
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								17d694630d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9afde0a5b0
								
							
								
							
						 | 
						
							
							
								
								/workrecord/ranklist接口调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								e69fd4d564
								
							
								
							
						 | 
						
							
							
								
								修改查询客户下所有用户包括陌生人
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								67e9613512
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4867ae8ec7
								
							
								
							
						 | 
						
							
							
								
								/data/stats/plugins/workrecord/org-monthly增加pid,pids
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								373c0d72ea
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_stats_fix' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								686961043b
								
							
								
							
						 | 
						
							
							
								
								修改:如果根据currentAgencyId查不到组织信息,不再报错,直接返回空权限列表即可
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								17ec365ee1
								
							
								
							
						 | 
						
							
							
								
								客户改全局
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								285863d5d0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c5ec22c1ef
								
							
								
							
						 | 
						
							
							
								
								添加日志
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								4e27e89edf
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								243786f3b4
								
							
								
							
						 | 
						
							
							
								
								党员认证补充信息时,由于没匹配到自动审核失败的数据(原因是提交信息时人工进行了审核),报了空指针异常
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								141a1a94fb
								
							
								
							
						 | 
						
							
							
								
								议题统计-网格删除
							
							
							
							
								
							
							
						 | 
						4 years ago |