wangxianzhang
|
161e305abf
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud-zhengwu-yantai
|
3 years ago |
jianjun
|
d1fe1f616d
|
Merge remote-tracking branch 'remotes/origin/dev_compare_data' into 烟台-政务master
|
3 years ago |
|
jianjun
|
766e218e03
|
同步数据改为并行处理
|
3 years ago |
|
jianjun
|
467324a56c
|
Merge remote-tracking branch 'remotes/origin/dev_data_sync_user_org_for_yt' into 烟台-政务master
|
3 years ago |
|
jianjun
|
92d013f8bf
|
同步用户bug 没有删除
|
3 years ago |
|
wangxianzhang
|
1d93fd90d2
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
398e0b62f8
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud-zhengwu-yantai
|
3 years ago |
zxc
|
9ad8b23deb
|
no++
|
3 years ago |
|
jianjun
|
0e74817191
|
Merge remote-tracking branch 'remotes/origin/dev_compare_data' into 烟台-政务master
|
3 years ago |
|
jianjun
|
e6dbca7432
|
死亡 正常的 是错误的
|
3 years ago |
|
jianjun
|
edfdd734c7
|
Merge remote-tracking branch 'remotes/烟台/master' into 烟台-政务master
|
3 years ago |
yinzuomei
|
ec267d4774
|
Merge remote-tracking branch 'origin_elink/dev_1024'
|
3 years ago |
|
yinzuomei
|
d77f065604
|
epmetuser/epidemicPrevention/page
|
3 years ago |
|
jianjun
|
ede7aaaa86
|
Merge remote-tracking branch 'remotes/origin/dev_compare_data' into 烟台-政务master
|
3 years ago |
|
jianjun
|
73420a13a6
|
调用兰图数据比对接口 限流2
|
3 years ago |
|
yinzuomei
|
3af0ec6d35
|
加点注释
|
3 years ago |
|
yinzuomei
|
d4d3246963
|
Merge remote-tracking branch 'origin/dev_1024'
|
3 years ago |
|
yinzuomei
|
a16e8a1c11
|
修改文章
|
3 years ago |
|
jianjun
|
107d3d098a
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into 烟台-政务master
|
3 years ago |
|
jianjun
|
df957a4701
|
错误日志打印 调整为sdk2
|
3 years ago |
wxz
|
b233b3ad8b
|
修改打成jar包的名称，跟服务名一致
|
3 years ago |
|
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 |
|
yinzuomei
|
f8f95476a8
|
Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into dev_1024
|
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
|
c737a06d55
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into master-烟台
|
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
|
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 |
