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 |
|
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
|
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
|
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 |
|
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 |
|
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 |
