yinzuomei
|
4b2c7c2cc0
|
Merge remote-tracking branch 'origin/dev_dengjima' into dev_dengjima
|
3 years ago |
|
yinzuomei
|
860fd66421
|
test
|
3 years ago |
zxc
|
0f2a1e08be
|
受众列表
|
3 years ago |
|
zxc
|
67a4600b24
|
暂提列表
|
3 years ago |
|
yinzuomei
|
f0940203c9
|
daoru
|
3 years ago |
|
zxc
|
f1aa2c8daf
|
删除新增
|
3 years ago |
|
zxc
|
1f7a110ffb
|
Merge remote-tracking branch 'origin/dev_dengjima' into dev_dengjima
|
3 years ago |
|
yinzuomei
|
efdd3b8680
|
Merge remote-tracking branch 'origin/dev_dengjima' into dev_dengjima
|
3 years ago |
|
yinzuomei
|
5c8f7be43e
|
差导入了。
|
3 years ago |
|
zxc
|
9985fa5f69
|
emm
|
3 years ago |
|
zxc
|
631abd8412
|
。
|
3 years ago |
|
zxc
|
5c5f611235
|
emm
|
3 years ago |
|
zxc
|
03e2defded
|
登记码生成
|
3 years ago |
|
zxc
|
8b53d5c310
|
emm
|
3 years ago |
|
yinzuomei
|
19faf7b2a9
|
placeCategory
|
3 years ago |
|
zxc
|
9568c67928
|
代码生成
|
3 years ago |
|
yinzuomei
|
4702a8f222
|
企事业单位表新增场所类别place_category、规模scale_total 45
|
3 years ago |
|
yinzuomei
|
68578f08ee
|
企事业单位表新增场所类别place_category、规模scale_total
|
3 years ago |
zhangyuan
|
a5372ce63b
|
Merge branch 'feature/xuncha_zhy'
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseService.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java
九小场所变更记录
|
3 years ago |
|
yinzuomei
|
da0447fc49
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj'
|
3 years ago |
|
yinzuomei
|
9ec98cd171
|
灵山卫不校验所属党支部
|
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 |
|
yinzuomei
|
20a9a75212
|
Merge remote-tracking branch 'origin/dev_data_sync_user_org_for_yt'
|
3 years ago |
|
yinzuomei
|
95dc31ae8c
|
Merge remote-tracking branch 'origin/dev_compare_data'
|
3 years ago |
|
zxc
|
1b69f4e083
|
处理成功不需要了
|
3 years ago |
|
zxc
|
970e59652d
|
处理成功不需要了
|
3 years ago |
|
zxc
|
195e2c617d
|
emm
|
3 years ago |
|
yinzuomei
|
d9922197aa
|
加俩索引
|
3 years ago |
|
zxc
|
f1824bf0ab
|
emm
|
3 years ago |
|
yinzuomei
|
e7adc2f69e
|
MOBILE_TELEPHONE_NUMBER
|
3 years ago |
|
jianjun
|
b1f71eb64f
|
详情空指针
|
3 years ago |
|
jianjun
|
47c5a4d4bc
|
获取本机组织信息接口
|
3 years ago |
|
zxc
|
b56bed065a
|
组织ID
|
3 years ago |
|
yinzuomei
|
bd1863d281
|
Merge remote-tracking branch 'origin/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
|
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 |
