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 |
|
yinzuomei
|
1508d1fdf6
|
@PostMapping("/epmetuser/dataSyncConfig/natInfoScanTask")
|
3 years ago |
|
yinzuomei
|
cca7d19269
|
Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into dev_dingV1
Conflicts:
epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
|
3 years ago |
|
yinzuomei
|
a2371b88e9
|
Merge remote-tracking branch 'origin/dev_compare_data'
|
3 years ago |
|
yinzuomei
|
1bd9d050ab
|
ScanContentUtils.imgSyncScan+textSyncScan本机or开发环境直接返回。
|
3 years ago |
|
yinzuomei
|
74b61e313a
|
改下试试
|
3 years ago |
zxc
|
d3515ce827
|
客户ID换成yt
|
3 years ago |
|
yinzuomei
|
e2f209c669
|
！
|
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 |
wangxianzhang
|
f21d691438
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud-zhengwu-yantai
|
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 |
|
wangxianzhang
|
6faf56cebc
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud-zhengwu-yantai
|
3 years ago |
|
jianjun
|
902663e35e
|
Revert "错误日志 获取traceId"
This reverts commit e3be103e
|
3 years ago |
|
jianjun
|
baa05781b8
|
Merge branch 'master-烟台' into 烟台-政务master
|
3 years ago |
|
jianjun
|
34662c8832
|
Merge remote-tracking branch 'remotes/origin/dev_compare_data' into 烟台-政务master
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
|
3 years ago |
|
yinzuomei
|
b37bf43b5f
|
Merge remote-tracking branch 'origin_elink/dev_compare_data'
|
3 years ago |
|
yinzuomei
|
dc470202d3
|
Merge remote-tracking branch 'origin_elink/dev_tmdata'
|
3 years ago |
|
zxc
|
ade42fdf88
|
删除org的明文查询
|
3 years ago |
|
jianjun
|
b5c6827510
|
开启日志过滤
|
3 years ago |
|
zxc
|
8727aff51e
|
不用加之前的日志
|
3 years ago |
|
jianjun
|
d1b6515fbd
|
Merge remote-tracking branch 'remotes/origin/dev_data_sync_user_org_for_yt' into 烟台-政务master
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
|
3 years ago |
|
jianjun
|
8f87df55d8
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 烟台-政务master
# Conflicts:
# epmet-user/epmet-user-server/src/main/resources/excel/ic_nat.xlsx
|
3 years ago |
|
jianjun
|
aa67941463
|
Merge remote-tracking branch 'remotes/烟台/master' into 烟台-政务master
|
3 years ago |
