Tree: bdfe019920

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'bdfe019920'

${ noResults }

Commit Graph

24619 Commits (bdfe019920346834173f9091d38edd509a54c78f)

 

All Branches   

Search

Author	SHA1	Message	Date
yinzuomei	c2ef8b42f0	Merge remote-tracking branch 'origin/master' # Conflicts: # epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java # epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java	3 years ago
jianjun	2b16bbc63a	解决错误	3 years ago
jianjun	8bd5a9baa4	Merge remote-tracking branch 'remotes/烟台/master' into 烟台-政务master # Conflicts: # epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java # epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java # epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java	3 years ago
jianjun	4ffbd20019	Merge remote-tracking branch 'remotes/origin/dev_data_sync_user_org_for_yt' into master-烟台 # Conflicts: # epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java # epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java	3 years ago
jianjun	bcc955ba16	Merge remote-tracking branch 'remotes/origin/dev_data_sync_user_org_for_yt' # Conflicts: # epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java # epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java	3 years ago
jianjun	2c3c1ab217	组织信息	3 years ago
yinzuomei	e83c2b5eca	Merge remote-tracking branch 'origin/dev_dingV1'	3 years ago
yinzuomei	206719d304	房屋列表增加入参	3 years ago
zxc	5c70d4d453	字段放到relation	3 years ago
zxc	aa62e03c73	核酸检测信息导入	3 years ago
jianjun	89f2045be2	组织id更换测了一下外网ip 不行3	3 years ago
jianjun	4a6b19aee4	组织id更换测了一下外网ip 不行3	3 years ago
zxc	e15f353229	核酸检测信息	3 years ago
zxc	82ef981a20	核酸检测信息	3 years ago
yinzuomei	de9902f5c7	未做核酸比对查询调整	3 years ago
yinzuomei	1384e6b0f8	删除文章	3 years ago
yinzuomei	b03873fd40	注视	3 years ago
yinzuomei	3144131623	Merge remote-tracking branch 'origin/dev_1024' into dev_1024	3 years ago
yinzuomei	fc1992863d	修改文章	3 years ago
jianjun	b374f3ac3d	Merge remote-tracking branch 'remotes/origin/dev_data_sync_user_org_for_yt' into 烟台-政务master	3 years ago
jianjun	d3a89ced33	组织id更换测了一下外网ip 不行	3 years ago
zxc	386adfca8e	居民防疫信息	3 years ago
yinzuomei	4c71aa04b4	发布的文章可以编辑todo	3 years ago
yinzuomei	6fece1b0c3	Merge remote-tracking branch 'origin/dev_compare_data'	3 years ago
zxc	4921cc8b55	批量更新核酸检测改ID	3 years ago
yinzuomei	babd8019ff	Merge remote-tracking branch 'origin/dev_compare_data'	3 years ago
zxc	c38f0a5a34	批量更新核酸检测改ID	3 years ago
yinzuomei	dffda31b76	隔离防疫删除	3 years ago
yinzuomei	d1cd29b117	Merge remote-tracking branch 'origin/dev_compare_data'	3 years ago
jianjun	ff2e03d44c	Merge remote-tracking branch 'origin/dev_compare_data' into dev_compare_data	3 years ago
jianjun	6d10a7583e	你看看	3 years ago
yinzuomei	f34870dec4	表决中议题发布时间	3 years ago
jianjun	ec8e52ce47	Merge remote-tracking branch 'remotes/origin/dev_compare_data' into 烟台-政务master	3 years ago
yinzuomei	972e583dfd	genderCn	3 years ago
yinzuomei	aed95ab272	死亡判断下	3 years ago
jianjun	2963c984f6	Merge remote-tracking branch 'remotes/origin/dev_compare_data' into 烟台-政务master	3 years ago
jianjun	5d7f535277	残疾报错	3 years ago
jianjun	6bf2e1a0c8	Merge remote-tracking branch 'remotes/origin/dev_data_sync_user_org_for_yt' into 烟台-政务master	3 years ago
jianjun	a582053be6	不知道	3 years ago
yinzuomei	835f592999	Merge remote-tracking branch 'origin_elink/master'	3 years ago
yinzuomei	1508d1fdf6	@PostMapping("/epmetuser/dataSyncConfig/natInfoScanTask")	3 years ago
yinzuomei	cca7d19269	Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into dev_dingV1 Conflicts: epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java	3 years ago
yinzuomei	a2371b88e9	Merge remote-tracking branch 'origin/dev_compare_data'	3 years ago
yinzuomei	1bd9d050ab	ScanContentUtils.imgSyncScan+textSyncScan本机or开发环境直接返回。	3 years ago
yinzuomei	74b61e313a	改下试试	3 years ago
zxc	d3515ce827	客户ID换成yt	3 years ago
yinzuomei	e2f209c669	！	3 years ago
jianjun	20876f6eb2	Merge remote-tracking branch 'remotes/origin/dev_compare_data' into 烟台-政务master	3 years ago
jianjun	32d383951f	优化下	3 years ago
jianjun	6a999b27fd	token	3 years ago