jianjun
|
c737a06d55
|
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
|
8221c1bc4b
|
gov-voice 启动时初始化 党建声音标签
|
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
|
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 |
zxc
|
b56bed065a
|
组织ID
|
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
|
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
|
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 |
|
yinzuomei
|
972e583dfd
|
genderCn
|
3 years ago |
|
yinzuomei
|
aed95ab272
|
死亡判断下
|
3 years ago |
|
jianjun
|
5d7f535277
|
残疾报错
|
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
|
32d383951f
|
优化下
|
3 years ago |
|
jianjun
|
6a999b27fd
|
token
|
3 years ago |
|
jianjun
|
b36e487607
|
放开todo12312
|
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
|
5706a4457f
|
返回客户Id
|
3 years ago |
|
jianjun
|
bb3e626ef4
|
1111
|
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 |
