wangchao
							
						 | 
						
							
							
							
								
							
								e93fe29df6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								b24045f383
								
							
								
							
						 | 
						
							
							
								
								积分调整人员列表查询,将从user_customer查询(首次注册居民Id以及[非首次]注册居民Id)改成从register_relation查询(首次注册居民Id以及[非首次]注册居民Id)
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								abf6273969
								
							
								
							
						 | 
						
							
							
								
								third服务升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								16f430f019
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_thirdplatform' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								99c721b6b0
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								cd3f95efb6
								
							
								
							
						 | 
						
							
							
								
								代码管理版本回退
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5206cc98df
								
							
								
							
						 | 
						
							
							
								
								保存居民信息时 更新注册状态
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								25616b3c3e
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								6d058b9460
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into release
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								18d7cf0e22
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'release' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								9558fbfdc8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_plugins' into dev_plugins
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								eb818a326e
								
							
								
							
						 | 
						
							
							
								
								epmet-ext 部门人员信息
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								3811356b05
								
							
								
							
						 | 
						
							
							
								
								third服务升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								60fee6e123
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_thirdplatform' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								0ec274261c
								
							
								
							
						 | 
						
							
							
								
								代码管理功能完善
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								0f5d622875
								
							
								
							
						 | 
						
							
							
								
								部署heart,user
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								fea2ad9d9a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev' into release
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								d7bfefa6d8
								
							
								
							
						 | 
						
							
							
								
								定制功能- 修改逻辑-初稿
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2f8c454cb7
								
							
								
							
						 | 
						
							
							
								
								部署heart
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								dc51be0abd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_heart' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d5bbef5393
								
							
								
							
						 | 
						
							
							
								
								部署heart
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								86fb9e6184
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev' into release
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								16022f1fc2
								
							
								
							
						 | 
						
							
							
								
								活动回顾列表修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								0d9a084576
								
							
								
							
						 | 
						
							
							
								
								部署point
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								cbdc5c096b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev' into release
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								0d2cfb242c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_plugins' into dev_plugins
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								9bdddd4216
								
							
								
							
						 | 
						
							
							
								
								网格工作人员
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								a8a034b06c
								
							
								
							
						 | 
						
							
							
								
								定制功能-新增、删除、查询方法
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								8b081281c0
								
							
								
							
						 | 
						
							
							
								
								添加定制功能访问记录表以及代码生成
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								2c5fa9fd45
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_plugins' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_plugins
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								a564ec8de8
								
							
								
							
						 | 
						
							
							
								
								epmet-ext dto提交
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								b28cde0b0f
								
							
								
							
						 | 
						
							
							
								
								heart +1        user +1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								d086f7de09
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								844f572a29
								
							
								
							
						 | 
						
							
							
								
								查询志愿者userId方法更改名称
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								1ba2504daa
								
							
								
							
						 | 
						
							
							
								
								积分调整可选用户列表,跨客户、单客户
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								2c14efdc78
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								b6379df34d
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'master' and 'release' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release
							
							
							
							
							
							
								
							
							
							 Conflicts:
	epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
	epmet-module/gov-org/gov-org-server/pom.xml 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								12759b3f0e
								
							
								
							
						 | 
						
							
							
								
								小程序发布修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								d3bcb1f05c
								
							
								
							
						 | 
						
							
							
								
								小程序发布修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								02305a9eff
								
							
								
							
						 | 
						
							
							
								
								controller和service添加
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								6349521c01
								
							
								
							
						 | 
						
							
							
								
								docker增加restart选项
							
							
							
							
							
							
								
							
							
							版本升级 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								a8ef533f92
								
							
								
							
						 | 
						
							
							
								
								docker增加restart选项
							
							
							
							
							
							
								
							
							
							版本升级 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								6c852ac6ae
								
							
								
							
						 | 
						
							
							
								
								docker增加restart选项
							
							
							
							
							
							
								
							
							
							版本升级 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								a40ec542d5
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								7bcedf2ac2
								
							
								
							
						 | 
						
							
							
								
								网格添加修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								7ad16dabc9
								
							
								
							
						 | 
						
							
							
								
								项目追踪修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								0e45a343cb
								
							
								
							
						 | 
						
							
							
								
								积分调整不查询没有注册过志愿者的陌生人
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								83424ba36b
								
							
								
							
						 | 
						
							
							
								
								修改sql脚本 设置网格数默认10
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								b3e254433b
								
							
								
							
						 | 
						
							
							
								
								服务升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								b922ca717e
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'release' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release
							
							
							
							
								
							
							
						 | 
						5 years ago |