yinzuomei
							
						 | 
						
							
							
							
								
							
								2c8a8743c2
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_abandon_grid' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c22edf30a1
								
							
								
							
						 | 
						
							
							
								
								废弃网格,前置判断项目
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								cd9c0da401
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_abandon_grid' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								6a02fd095b
								
							
								
							
						 | 
						
							
							
								
								查询未结案项目状态
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								5e52b79d1d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_abandon_grid' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								373ac76d5f
								
							
								
							
						 | 
						
							
							
								
								查询未结案项目状态
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								256f38a6a9
								
							
								
							
						 | 
						
							
							
								
								项目管理-全部组织树,不展示废弃的网格
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5b8bd39079
								
							
								
							
						 | 
						
							
							
								
								/heart/work/act/sponsorlist发布活动主办方不展示废弃的网格
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4dff78a636
								
							
								
							
						 | 
						
							
							
								
								工作端议题转项目,限值未废弃网格
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								66234e1c5c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_qr_code' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								f06c7b607f
								
							
								
							
						 | 
						
							
							
								
								查询社区list
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7989691bfd
								
							
								
							
						 | 
						
							
							
								
								废弃网格时,校验是否存在未昨晚的工作,提示语按照禅道需求来。
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								f93c4f1568
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_memo' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								70bc046722
								
							
								
							
						 | 
						
							
							
								
								书记日志导出word,文件名修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								a4c8818351
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_memo' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								9b3b5b23cf
								
							
								
							
						 | 
						
							
							
								
								书记日志导出word,文件名修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								64865d6c1d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_qr_code' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								bec8cb2afe
								
							
								
							
						 | 
						
							
							
								
								采集列表微调
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								914b3e8c82
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_qr_code' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8930f00674
								
							
								
							
						 | 
						
							
							
								
								前端做校验
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								671b754a8c
								
							
								
							
						 | 
						
							
							
								
								前端做校验
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								666971bdc9
								
							
								
							
						 | 
						
							
							
								
								成员只限制姓名身份证号必填
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								8087817caf
								
							
								
							
						 | 
						
							
							
								
								二维码升级并设置文字间距
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								130f22d087
								
							
								
							
						 | 
						
							
							
								
								二维码升级并设置文字间距
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								2d078fce1e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_qr_code' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								0b53e6e032
								
							
								
							
						 | 
						
							
							
								
								name encode
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								fd988cd183
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_qr_code' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								edccc24487
								
							
								
							
						 | 
						
							
							
								
								encode
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8ead329b23
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_qr_code' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								014aff5953
								
							
								
							
						 | 
						
							
							
								
								1
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								32001a2310
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_qr_code' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6f091f414c
								
							
								
							
						 | 
						
							
							
								
								notnull
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								cb15944e33
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_qr_code' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								793cec8d68
								
							
								
							
						 | 
						
							
							
								
								成员相关信息校验
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ee24d2a928
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_qr_code' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4cbccbca19
								
							
								
							
						 | 
						
							
							
								
								居民信息采集表26
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6a2deadce9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_qr_code' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								68fb0790dd
								
							
								
							
						 | 
						
							
							
								
								居民信息采集表
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								a14e1bc313
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								cef8129dd5
								
							
								
							
						 | 
						
							
							
								
								组织树添加临时缓存 要不然前端容易挂
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								98acaa661a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_qr_code' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								c5b635a551
								
							
								
							
						 | 
						
							
							
								
								org dockerfile增加字体文件拷贝,供二维码中文字使用
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6ffb749371
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_qr_code' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								8518e36ba5
								
							
								
							
						 | 
						
							
							
								
								删除字体
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								a7a499a2f9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_qr_code' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								a31d810ee2
								
							
								
							
						 | 
						
							
							
								
								不知道
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c9d2e654d4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_qr_code' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								9eee9b5476
								
							
								
							
						 | 
						
							
							
								
								不知道
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								87354c931f
								
							
								
							
						 | 
						
							
							
								
								通知描述
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4d1a83ecdf
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_qr_code' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago |