Tree: f4a84fde25

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'f4a84fde25'

${ noResults }

Commit Graph

24064 Commits (f4a84fde255b6810ee89455cede8f35be5f1856c)

 

All Branches   

Search

Author	SHA1	Message	Date
zxc	2e1c025c61	补全暂提	3 years ago
yinzuomei	bd1863d281	Merge remote-tracking branch 'origin/dev_data_sync_user_org_for_yt'	3 years ago
yinzuomei	c19cd59b32	data_sync_org_data+data_sync_user_data 脚本	3 years ago
yinzuomei	181b179120	Merge branches 'dev_bugfix_ljj' and 'master' of http://121.42.41.42:7070/r/epmet-cloud into dev_bugfix_ljj Conflicts: epmet-user/epmet-user-server/src/main/resources/excel/ic_nat.xlsx	3 years ago
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	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
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	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
yinzuomei	972e583dfd	genderCn	3 years ago
yinzuomei	aed95ab272	死亡判断下	3 years ago
jianjun	5d7f535277	残疾报错	3 years ago
jianjun	a582053be6	不知道	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	32d383951f	优化下	3 years ago
jianjun	6a999b27fd	token	3 years ago
jianjun	b36e487607	放开todo12312	3 years ago
jianjun	8ffa9801a4	Merge branch 'dev_compare_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_compare_data Conflicts: epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java	3 years ago
jianjun	ca28a3b9fb	放开todo	3 years ago
jianjun	5706a4457f	返回客户Id	3 years ago
jianjun	bb3e626ef4	1111	3 years ago
zxc	ade42fdf88	删除org的明文查询	3 years ago
zxc	8727aff51e	不用加之前的日志	3 years ago