Tree: 533d64c1a5

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '533d64c1a5'

${ noResults }

Commit Graph

24297 Commits (533d64c1a596553a75a4cca0cea73e5b70a523c4)

 

All Branches   

Search

Author	SHA1	Message	Date
jianjun	533d64c1a5	Merge remote-tracking branch 'remotes/origin/master' into 烟台-政务master	3 years ago
jianjun	bfd0f7c42a	错误日志打印 调整为sdk	3 years ago
jianjun	9ee4cdb3ce	Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into 烟台-政务master Conflicts: epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java	3 years ago
jianjun	41942101a7	错误日志打印4	3 years ago
zhangyuan	a5372ce63b	Merge branch 'feature/xuncha_zhy' # Conflicts: # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseService.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java 九小场所变更记录	3 years ago
jianjun	db745b7ed3	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 烟台-政务master	3 years ago
jianjun	ef470302c7	错误日志打印3	3 years ago
jianjun	ac49ba5105	错误日志打印2	3 years ago
jianjun	cb1a67580a	错误日志打印	3 years ago
yinzuomei	da0447fc49	Merge remote-tracking branch 'origin/dev_bugfix_ljj'	3 years ago
yinzuomei	9ec98cd171	灵山卫不校验所属党支部	3 years ago
jianjun	fe74573da6	内容审核 加* 放过	3 years ago
jianjun	0a8137c267	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 烟台-政务master	3 years ago
jianjun	3b55d15316	gov-voice 启动时初始化 党建声音标签	3 years ago
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	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
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
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	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
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
jianjun	89f2045be2	组织id更换测了一下外网ip 不行3	3 years ago
jianjun	4a6b19aee4	组织id更换测了一下外网ip 不行3	3 years ago