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 |
|
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
|
2c3c1ab217
|
组织信息
|
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 |
|
zxc
|
4921cc8b55
|
批量更新核酸检测改ID
|
3 years ago |
|
zxc
|
c38f0a5a34
|
批量更新核酸检测改ID
|
3 years ago |
|
yinzuomei
|
dffda31b76
|
隔离防疫删除
|
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 |
|
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 |
|
yinzuomei
|
a2371b88e9
|
Merge remote-tracking branch 'origin/dev_compare_data'
|
3 years ago |
|
zxc
|
d3515ce827
|
客户ID换成yt
|
3 years ago |
|
jianjun
|
20876f6eb2
|
Merge remote-tracking branch 'remotes/origin/dev_compare_data' into 烟台-政务master
|
3 years ago |
|
jianjun
|
32d383951f
|
优化下
|
3 years ago |
|
jianjun
|
6a999b27fd
|
token
|
3 years ago |
|
jianjun
|
8288382b69
|
Merge remote-tracking branch 'remotes/origin/dev_compare_data' into 烟台-政务master
|
3 years ago |
|
jianjun
|
b36e487607
|
放开todo12312
|
3 years ago |
|
jianjun
|
96d0fe9837
|
Merge remote-tracking branch 'remotes/origin/dev_compare_data' into 烟台-政务master
|
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
|
c1b43bd8ad
|
Merge remote-tracking branch 'remotes/origin/dev_data_sync_user_org_for_yt' into 烟台-政务master
|
3 years ago |
|
jianjun
|
5706a4457f
|
返回客户Id
|
3 years ago |
|
jianjun
|
f6b2f33357
|
注掉了
|
3 years ago |
wangxianzhang
|
93cbf9c03d
|
-
|
3 years ago |
|
wangxianzhang
|
387d6976f1
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud-zhengwu-yantai
|
3 years ago |
|
jianjun
|
22b602d44d
|
aaaa
|
3 years ago |
|
jianjun
|
721e3a2b23
|
Revert "Revert "错误日志 获取traceId""
This reverts commit 902663e3
|
3 years ago |
|
jianjun
|
f7cf656b86
|
Merge remote-tracking branch 'remotes/origin/dev_data_sync_user_org_for_yt' into 烟台-政务master
|
3 years ago |
|
jianjun
|
bb3e626ef4
|
1111
|
3 years ago |
