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
|
4 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
|
4 years ago |
|
jianjun
|
aa67941463
|
Merge remote-tracking branch 'remotes/烟台/master' into 烟台-政务master
|
4 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
|
4 years ago |
|
jianjun
|
e338601bbc
|
第三方接口暴露 3
|
4 years ago |
yinzuomei
|
ae604e8129
|
/staff/editstaffinit
|
4 years ago |
|
yinzuomei
|
0bb8d64201
|
Merge remote-tracking branch 'origin_elink/dev_compare_data'
|
4 years ago |
|
yinzuomei
|
a2a3c1dd8a
|
Merge remote-tracking branch 'origin_elink/dev_tmdata'
|
4 years ago |
|
yinzuomei
|
41da88ef7c
|
事件详情/gov/project/icEvent/detail身份证号脱敏
|
4 years ago |
|
yinzuomei
|
1b3a4a4262
|
LOUTI
|
4 years ago |
zxc
|
1014523743
|
证件号
|
4 years ago |
|
yinzuomei
|
8ffc890fc9
|
/data/aggregator/org/staffdetailv2提示报错。返回customerId
|
4 years ago |
|
yinzuomei
|
59aa229fbb
|
/gov/org/staff/editstaff,staff_role.customerId赋值
|
4 years ago |
|
yinzuomei
|
271a9ad658
|
/gov/org/staff/editstaffinit返回customerId，staff_org_relation改了下注释
|
4 years ago |
|
zxc
|
e60958c0b8
|
证件号
|
4 years ago |
|
zxc
|
3f6f36cd9a
|
证件号
|
4 years ago |
|
yinzuomei
|
7ac6ba4d2b
|
ImportEpidemicSpecialAttention人家是证件号
|
4 years ago |
|
yinzuomei
|
9513601af0
|
/gov/org/staff/addstaffv2兼容运营端调用;staff/editstaff调整报错提示
|
4 years ago |
|
yinzuomei
|
204444a511
|
/gov/org/staff/addstaffv2兼容运营端调用
|
4 years ago |
|
zxc
|
68d6e8c6d5
|
Merge remote-tracking branch 'origin/dev_data_sync_user_org_for_yt' into dev_data_sync_user_org_for_yt
|
4 years ago |
|
zxc
|
1294fe08be
|
暂提
|
4 years ago |
|
jianjun
|
90c1dd6d98
|
Merge remote-tracking branch 'origin/dev_data_sync_user_org_for_yt' into dev_data_sync_user_org_for_yt
|
4 years ago |
|
jianjun
|
883d11ef94
|
第三方接口暴露 2
|
4 years ago |
|
yinzuomei
|
3bf07b18b1
|
Merge remote-tracking branch 'origin/dev_data_sync_user_org_for_yt' into dev_data_sync_user_org_for_yt
|
4 years ago |
|
yinzuomei
|
2e2894d682
|
/data/aggregator/org/staffdetailv2的szsqRoles调整
|
4 years ago |
|
jianjun
|
3bd02ea44c
|
第三方接口暴露
|
4 years ago |
|
yinzuomei
|
c70029ee9a
|
Merge remote-tracking branch 'origin/dev_data_sync_user_org_for_yt' into dev_data_sync_user_org_for_yt
|
4 years ago |
|
yinzuomei
|
febc7ffbad
|
/gov/org/staff/editstaffinit小程序传参：agencyId+staffId；运营端传参：customerId+staffId
|
4 years ago |
|
zxc
|
31134daaf9
|
暂提
|
4 years ago |
|
yinzuomei
|
8cd96d021b
|
Merge remote-tracking branch 'origin/dev_data_sync_user_org_for_yt' into dev_data_sync_user_org_for_yt
|
4 years ago |
|
yinzuomei
|
c1fdaaf54b
|
/gov/org/staff/editstaffinit兼容运营端去调用
|
4 years ago |
|
zxc
|
38249c5586
|
根组织缓存
|
4 years ago |
|
yinzuomei
|
995653e286
|
所属组织-
|
4 years ago |
|
yinzuomei
|
ed11d566e2
|
/dataSync/page-user
|
4 years ago |
|
yinzuomei
|
2970a5913a
|
Merge remote-tracking branch 'origin_elink/dev_compare_data'
# Conflicts:
# epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java
|
4 years ago |
|
zxc
|
45612749f8
|
根组织
|
4 years ago |
|
yinzuomei
|
f3fac956d6
|
/data/aggregator/org/staffdetailv2优化下报错
|
4 years ago |
|
yinzuomei
|
258252b8a8
|
Merge remote-tracking branch 'origin_elink/dev_tmdata'
# Conflicts:
# epmet-gateway/src/main/resources/bootstrap.yml
|
4 years ago |
|
yinzuomei
|
96decee7d6
|
Merge remote-tracking branch 'origin/dev_tmdata' into dev_tmdata
|
4 years ago |
|
yinzuomei
|
87486760e6
|
/data/aggregator/coverage/search手机号身份证号加密
|
4 years ago |
|
jianjun
|
b89d98cc51
|
五大图层脱敏
|
4 years ago |
|
zxc
|
a3b78a873b
|
ai
|
4 years ago |
|
yinzuomei
|
cd8310c0fd
|
/gov/org/staff/editstaffinit返回组织名称
|
4 years ago |
|
zxc
|
bbbc092da8
|
job
|
4 years ago |
|
zxc
|
4c77e949f7
|
job
|
4 years ago |
|
yinzuomei
|
77999d74bd
|
Merge remote-tracking branch 'origin/dev_data_sync_user_org_for_yt' into dev_data_sync_user_org_for_yt
|
4 years ago |
|
yinzuomei
|
fbe18720e3
|
Merge remote-tracking branch 'origin/dev_data_sync_user_org_for_yt' into dev_data_sync_user_org_for_yt
|
4 years ago |
|
zxc
|
c928a5a8a0
|
feign
|
4 years ago |
|
yinzuomei
|
4967e63e57
|
/gov/org/staff/editstaffinit 返参增加agencyId
|
4 years ago |
|
zxc
|
7bcddfad69
|
拉取org
|
4 years ago |
