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 |
|
zxc
|
36acdfa730
|
居民修改时 删除居民缓存
|
3 years ago |
|
zxc
|
5d4b981c47
|
积分规则日志新增字段
|
3 years ago |
|
zxc
|
48f6175487
|
登录日志新增字段
|
3 years ago |
|
zxc
|
67b47a5b29
|
日志之前逻辑加 新字段
|
3 years ago |
|
zxc
|
ef1dc23316
|
列表
|
3 years ago |
|
zxc
|
4ac4e9bfe8
|
mingwen buquan
|
3 years ago |
|
jianjun
|
8ec327e7ea
|
Merge branch 'dev_data_sync_user_org_for_yt' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_data_sync_user_org_for_yt
|
3 years ago |
|
jianjun
|
e338601bbc
|
第三方接口暴露 3
|
3 years ago |
|
zxc
|
142dc283a1
|
暂提补全
|
3 years ago |
|
zxc
|
98d1a63b76
|
明文查看
|
3 years ago |
|
yinzuomei
|
71553b7a81
|
7、核酸检测记录详情：/epmetuser/icNat/detail返回show
|
3 years ago |
|
yinzuomei
|
ed87e2e715
|
1、居民防疫信息查看/epmetuser/epidemicPrevention/detail手机号身份证号脱敏,show
|
3 years ago |
|
yinzuomei
|
73b7ff7f8b
|
5、疫苗接种关注名单详情：/epmetuser/icEpidemicSpecialAttention/detail增加show
|
3 years ago |
|
yinzuomei
|
c15d7b8302
|
形成上报列表是加密的，还不能去掉realMobile、realIdCard
|
3 years ago |
|
yinzuomei
|
c60027a178
|
/epmetuser/tripreport/detail形成上报返回showMobile、showIdCard
|
3 years ago |
|
yinzuomei
|
63bd619194
|
3、疫苗接种记录查看/epmetuser/icVaccine/detail，showMobile,showIdCard加密
|
3 years ago |
|
yinzuomei
|
5e5a7df0c2
|
2、行程上报详情：/epmetuser/tripreport/detail 手机号身份证号加密
|
3 years ago |
|
zxc
|
8992ac40a1
|
明文查看
|
3 years ago |
|
yinzuomei
|
6532184e73
|
/gov/access/menu/batch-save
|
3 years ago |
|
yinzuomei
|
ea3b3119d9
|
靠，加错地方了
|
3 years ago |
|
yinzuomei
|
55a24ec49c
|
menu/batch-save方便我自己
|
3 years ago |
|
zxc
|
9c1d691306
|
明文查看
|
3 years ago |
|
yinzuomei
|
0e5b917f8e
|
1、居民防疫信息查看/epmetuser/epidemicPrevention/detail手机号身份证号脱敏
|
3 years ago |
|
yinzuomei
|
ae604e8129
|
/staff/editstaffinit
|
3 years ago |
