Tree: eda98517e2

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'eda98517e2'

${ noResults }

Commit Graph

25480 Commits (eda98517e22f6c9e21853ddcd7c5f5d0ff7bde91)

 

All Branches   

Search

Author	SHA1	Message	Date
jianjun	9d37d0c2b3	Revert "gov-voice 启动时初始化 党建声音标签" This reverts commit 8221c1bc	3 years ago
jianjun	2186a8fade	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' 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-server/src/main/resources/excel/ic_nat.xlsx	3 years ago
jianjun	8221c1bc4b	gov-voice 启动时初始化 党建声音标签	3 years ago
jianjun	32b010ceeb	Merge remote-tracking branch 'remotes/烟台/master' into 烟台-政务master	3 years ago
jianjun	1b3a5bc2ed	Merge remote-tracking branch 'remotes/origin/dev_dingV1' into 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
yinzuomei	d45190b674	;	3 years ago
yinzuomei	20a9a75212	Merge remote-tracking branch 'origin/dev_data_sync_user_org_for_yt'	3 years ago
yinzuomei	95dc31ae8c	Merge remote-tracking branch 'origin/dev_compare_data'	3 years ago
zxc	b3d16dbef9	是否本地居民	3 years ago
zxc	9b5d77f4d2	xin zeng	3 years ago
yinzuomei	10239dd05e	返回全部	3 years ago
yinzuomei	ce06ac05d5	房屋管理，gov/org/icneighborhood/neighborhood-options v2	3 years ago
yinzuomei	cd64f360cd	房屋管理，gov/org/icneighborhood/neighborhood-options	3 years ago
jianjun	c154e86f5a	Merge remote-tracking branches 'remotes/origin/dev_compare_data' and 'remotes/origin/dev_data_sync_user_org_for_yt' into 烟台-政务master	3 years ago
zxc	1b69f4e083	处理成功不需要了	3 years ago
yinzuomei	076482840a	todo	3 years ago
zxc	970e59652d	处理成功不需要了	3 years ago
zxc	195e2c617d	emm	3 years ago
jianjun	4040099252	Merge remote-tracking branch 'remotes/origin/dev_data_sync_user_org_for_yt' into 烟台-政务master	3 years ago
yinzuomei	adc91f5c0d	/epmetuser/icNatCompareRecord/page	3 years ago
yinzuomei	d9922197aa	加俩索引	3 years ago
zxc	f1824bf0ab	emm	3 years ago
yinzuomei	e7adc2f69e	MOBILE_TELEPHONE_NUMBER	3 years ago
jianjun	ab958a40a8	Merge remote-tracking branch 'remotes/烟台/master' into 烟台-政务master	3 years ago
jianjun	5e5f0e8b6f	Merge remote-tracking branch '烟台/master' into master-烟台	3 years ago
jianjun	8cc50962c0	Merge remote-tracking branches 'remotes/origin/dev_compare_data' and 'remotes/origin/dev_data_sync_user_org_for_yt' into master-烟台	3 years ago
jianjun	b1f71eb64f	详情空指针	3 years ago
jianjun	47c5a4d4bc	获取本机组织信息接口	3 years ago
jianjun	50bdc0624d	Merge remote-tracking branch 'remotes/origin/dev_data_sync_user_org_for_yt' into 烟台-政务master	3 years ago
zxc	b56bed065a	组织ID	3 years ago
zxc	2e1c025c61	补全暂提	3 years ago
jianjun	4dbe588453	Merge remote-tracking branch 'remotes/烟台/master' into 烟台-政务master	3 years ago
yinzuomei	70d7e279f7	Merge remote-tracking branch 'origin_elink/dev_data_sync_user_org_for_yt'	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	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