zhaoqifeng
							
						 | 
						
							
							
							
								
							
								1138f961d3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_plugins' into dev_temp
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
#	epmet-module/epmet-third/epmet-third-server/pom.xml 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								d9cb1ba8d0
								
							
								
							
						 | 
						
							
							
								
								关闭话题添加已解决未解决
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								069e0fda29
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_plugins' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_plugins
							
							
							
							
							
							
								
							
							
							 Conflicts:
	epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
	epmet-module/epmet-third/epmet-third-server/pom.xml
	epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
	epmet-module/resi-group/resi-group-server/pom.xml
	epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
	epmet-user/epmet-user-server/pom.xml 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								2cccd03131
								
							
								
							
						 | 
						
							
							
								
								user 升级 同步130   版本号到 118       [test.yml]
							
							
							
							
							
							
								
							
							
							group升级 同步130   版本号到 66        [test.yml] 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								08ed155bf9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into release
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								4f9d8639c4
								
							
								
							
						 | 
						
							
							
								
								user    +1    118
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								7a31fc276c
								
							
								
							
						 | 
						
							
							
								
								查找用户的身份信息 修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								40669bca49
								
							
								
							
						 | 
						
							
							
								
								resi-group 版本号+1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								4182141e1a
								
							
								
							
						 | 
						
							
							
								
								plugin  staffINfo
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								31d5fcc31f
								
							
								
							
						 | 
						
							
							
								
								机关工作人员,部门工作人员,网格工作人员
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								032463eabe
								
							
								
							
						 | 
						
							
							
								
								集群外部服务请求认证注解和拦截器雏形
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								dcf8e83e75
								
							
								
							
						 | 
						
							
							
								
								user +1   -> 117
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								0fd867815f
								
							
								
							
						 | 
						
							
							
								
								enterGrid时,不去校验客户Id,多客户版本(党群e事通),一个用户在多个客户下只能注册一次居民,单客户版本(不同appId),同样的微信账户在不同的小程序下使用的是不同的帐号,因此也不必校验customerId
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								9c343e42bc
								
							
								
							
						 | 
						
							
							
								
								部署gateWay
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								f963928a0e
								
							
								
							
						 | 
						
							
							
								
								ext 提交文件
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								43abf70599
								
							
								
							
						 | 
						
							
							
								
								resi-group  服务更新
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								03af4c982a
								
							
								
							
						 | 
						
							
							
								
								对外接口 查询工作人员信息
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								d46e5d5103
								
							
								
							
						 | 
						
							
							
								
								agency删除未用import
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								c0f3654f2a
								
							
								
							
						 | 
						
							
							
								
								机关工作人员查询,ext服务修改 url,添加 epmet
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								b26172ed45
								
							
								
							
						 | 
						
							
							
								
								修改客户定制功能上下架、客户定制功能修改,接口开发
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d8b1e9ebf1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/release_temp'
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6aea81a5fc
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_temp' into release_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ff8f1eef5d
								
							
								
							
						 | 
						
							
							
								
								升级heart
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								f4c14fd885
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/release_temp'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								71fd9dcb7e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_temp' into release_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5117d84218
								
							
								
							
						 | 
						
							
							
								
								修改亿联云 正式消息网关地址
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								aea782cdd8
								
							
								
							
						 | 
						
							
							
								
								生成服务升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7c11ab342a
								
							
								
							
						 | 
						
							
							
								
								升级user,gateway,auth
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d0be0542ea
								
							
								
							
						 | 
						
							
							
								
								升级third
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								89811dcc3c
								
							
								
							
						 | 
						
							
							
								
								部署third
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								53635864a7
								
							
								
							
						 | 
						
							
							
								
								部署third
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5a0b415091
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_thirdplatform' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								51e67611f8
								
							
								
							
						 | 
						
							
							
								
								机器人信息修改,取消授权修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								723a06aa36
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_plugins' into dev_plugins
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								8388888b9f
								
							
								
							
						 | 
						
							
							
								
								删除测试controller
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a273179e09
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_plugins' into dev_plugins
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								03dcf784c2
								
							
								
							
						 | 
						
							
							
								
								DB新增字段
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								826a141a69
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_plugins' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_plugins
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								72ff31c3fc
								
							
								
							
						 | 
						
							
							
								
								获取客户基本信息
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								3c0649c7fa
								
							
								
							
						 | 
						
							
							
								
								third服务升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								5b81ec0f57
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_thirdplatform' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								4f1fc836d9
								
							
								
							
						 | 
						
							
							
								
								third服务升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								cd79ffc372
								
							
								
							
						 | 
						
							
							
								
								项目处理响应
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								ed3393a847
								
							
								
							
						 | 
						
							
							
								
								机器人信息修改,取消授权修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								656f983af2
								
							
								
							
						 | 
						
							
							
								
								project group user 升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								42f46cd06a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_plugins' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								708a7eddff
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_plugins' into dev_plugins
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								ea22b09b81
								
							
								
							
						 | 
						
							
							
								
								关闭话题添加已解决未解决
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								6e751aa7a4
								
							
								
							
						 | 
						
							
							
								
								新增客户定制功能上下架记录表
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								a76644de52
								
							
								
							
						 | 
						
							
							
								
								项目详情-当前处理部门显示工作人员
							
							
							
							
								
							
							
						 | 
						5 years ago |