Tree: 7e65cf4d77

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '7e65cf4d77'

${ noResults }

Commit Graph

18158 Commits (7e65cf4d771cef40e26357d8dc64d36cd744bba9)

 

All Branches   

Search

Author	SHA1	Message	Date
jianjun	7e65cf4d77	Merge remote-tracking branch 'origin/pingyin_master' into pingyin_master	4 years ago
jianjun	753245672e	Revert "Revert "添加个条件"" This reverts commit 65b05bd5	4 years ago
wangxianzhang	38637f0b03	生产环境compose文件，替换为version_placeholder	4 years ago
wangxianzhang	1e004010f7	Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master Conflicts: epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml epmet-auth/deploy/docker-compose-prod.yml epmet-gateway/deploy/docker-compose-prod.yml epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml epmet-user/epmet-user-server/deploy/docker-compose-prod.yml	4 years ago
wangxianzhang	338f086f49	Merge remote-tracking branch 'origin/dev' into dev	4 years ago
wangxianzhang	a339bc561f	生产环境compose文件，替换为version_placeholder	4 years ago
zxc	cc0155d913	放重复提交注解添加，申请接口和审核接口	4 years ago
jianjun	c7edec6fb2	工作日任务调整	4 years ago
jianjun	10e72cc10c	Merge remote-tracking branch 'remotes/origin/dev' into pingyin_master	4 years ago
jianjun	65b05bd569	Revert "添加个条件" This reverts commit 58fc9808	4 years ago
jianjun	d1d8a9f3b8	初始化工作日->废弃服务内部调用的定时 添加脚本	4 years ago
jianjun	43308f84a2	Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_ljj	4 years ago
jianjun	f74805ea21	初始化工作日->废弃服务内部调用的定时 方法改为post	4 years ago
jianjun	e7f3872c7d	初始化工作日->废弃服务内部调用的定时	4 years ago
jianjun	948251f3f2	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev # Conflicts: # epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/EpmetRequestHolder.java	4 years ago
jianjun	99919895be	bug	4 years ago
jianjun	8d89aef645	主键冲突 服务发布	4 years ago
jianjun	cd15a10e72	Revert "主键冲突 服务发布" This reverts commit 7b8e3907	4 years ago
jianjun	7b8e3907c9	主键冲突 服务发布	4 years ago
jianjun	059d54207f	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev	4 years ago
jianjun	e31b409225	删除测试类	4 years ago
jianjun	cfd63497f0	获取header报错导致业务失败	4 years ago
jianjun	a1919d5353	Merge remote-tracking branch 'remotes/origin/dev' into pingyin_master	4 years ago
wangxianzhang	1c5ab34b4d	Merge remote-tracking branch 'origin/dev' into dev	4 years ago
jianjun	1bd8b75e8c	bug	4 years ago
wangxianzhang	4178c25598	-	4 years ago
wangxianzhang	36ff04b99f	版本升级	4 years ago
jianjun	a0ecb4ae7f	Merge remote-tracking branch 'remotes/origin/dev' into pingyin_master	4 years ago
jianjun	bfef176b33	监听居民信息变动 如果是删除或者新增 则更新是否居民状态	4 years ago
zxc	e901f70541	emm bug	4 years ago
wangxianzhang	9c3969b85e	修复：-	4 years ago
wangxianzhang	dad3dc59aa	Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation	4 years ago
wangxianzhang	bf7e7f4109	修复：-	4 years ago
zhaoqifeng	29011bf20b	居民检索序号	4 years ago
wangxianzhang	83e083d07c	Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation	4 years ago
wangxianzhang	25035f51bc	修复：-	4 years ago
yinzuomei	42fa7cdf95	Merge branches 'dev' and 'dev_epidemic_situation' of http://121.42.41.42:7070/r/epmet-cloud into dev_epidemic_situation	4 years ago
wangxianzhang	abeff79831	修复：-	4 years ago
wangxianzhang	5bbf5af198	修复：-	4 years ago
sunyuchao	afe68a52d7	列表增加排序、表增加查询用索引	4 years ago
wangxianzhang	a5eec335b6	修复：1.核酸检测结果填入核酸检测地址导致sql报错的bug。	4 years ago
yinzuomei	a93f0a9034	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev	4 years ago
yinzuomei	02525ad799	zhushixia	4 years ago
jianjun	6bea405d99	导出核酸错误	4 years ago
jianjun	3630256dae	Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation	4 years ago
jianjun	58fc98085b	添加个条件	4 years ago
wangxianzhang	c2d920b192	修复：1.核酸检测导入，去掉检测地点必填校验；2.没有错误/提示行，不下载描述文件	4 years ago
yinzuomei	5155f7b38f	/gov/org/house/housedel内部调用/gov/org/house/delete	4 years ago
sunyuchao	799341a62b	bug修改	4 years ago
jianjun	7e6b5d1979	添加状态	4 years ago