wangxianzhang
|
6bf72c33c8
|
Merge branches 'master' and 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
6752d439ae
|
居民信息导入：提示话术修改
|
3 years ago |
|
wangxianzhang
|
1d8239440f
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
7723cc8c08
|
居民信息导入：修改对必填项的校验判断逻辑和提示逻辑
|
3 years ago |
jianjun
|
04dcd04ceb
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
jianjun
|
c8c254ffcf
|
Merge remote-tracking branch 'remotes/origin/dev'
|
3 years ago |
|
jianjun
|
44adc5c930
|
修正错误代码
|
3 years ago |
|
wangxianzhang
|
c2ed9d1279
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
49189eeee7
|
@ServletComponentScan注解指定basePackages的参数，个别服务的启动类太深，扫描不到common包中的filter
|
3 years ago |
|
jianjun
|
e1c12b0b04
|
Merge remote-tracking branch 'remotes/origin/dev'
|
3 years ago |
|
jianjun
|
21e2e02e06
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
|
jianjun
|
38f340b37c
|
菜单放缓存加强判断 避免空的被放进缓存
|
3 years ago |
|
jianjun
|
c2fe0cb04f
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
jianjun
|
b7993edeef
|
上报网格员数据
|
3 years ago |
|
wangxianzhang
|
c269a4ac25
|
【Nacos服务列表刷新监听】日志级别变为debug
|
3 years ago |
|
jianjun
|
c39b0f56eb
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
3 years ago |
|
jianjun
|
aab611f28a
|
修改日志级别
|
3 years ago |
zxc
|
102a2fbce6
|
Merge remote-tracking branch 'origin/dev'
|
3 years ago |
|
zxc
|
732300a19f
|
略微调整房屋导入
|
3 years ago |
|
jianjun
|
5e0ae7d483
|
网格员巡查在线数据
|
3 years ago |
|
wangxianzhang
|
a2425e57b5
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
83226ebd04
|
居民导入：idcard为空，导致selectOne return many
|
3 years ago |
|
wangxianzhang
|
d1b7281254
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
540692c2c8
|
修改：居民信息导入模板下载
修改：居民信息导入，如果未全成功，那么保留临时上传的那个excel文件，供排查问题
|
3 years ago |
|
wangxianzhang
|
9288657a68
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
3be65b0ff8
|
居民信息导入，增加了OfficeXmlFileException异常的判断，以防有用户乱改后缀名导致excel导入错误
|
3 years ago |
sunyuchao
|
e353b600cc
|
Merge branch 'dev'
|
3 years ago |
|
sunyuchao
|
5988f83f7a
|
请求方式调整
|
3 years ago |
|
jianjun
|
8d2d62d3b5
|
Merge remote-tracking branch 'remotes/origin/dev'
|
3 years ago |
|
jianjun
|
9c42c035f7
|
Merge remote-tracking branch 'remotes/origin/dev_epidemic_situation' into dev
|
3 years ago |
|
jianjun
|
c9eeb4601c
|
房屋左侧树优化
|
3 years ago |
|
jianjun
|
43748ea1f4
|
房屋左侧树优化
|
3 years ago |
|
jianjun
|
fa4ebff4bf
|
Merge remote-tracking branch 'remotes/origin/dev'
|
3 years ago |
|
jianjun
|
9d645a1461
|
Merge remote-tracking branch 'remotes/origin/dev_epidemic_situation' into dev
|
3 years ago |
|
jianjun
|
670f5ba7d1
|
mingzi bug
|
3 years ago |
|
jianjun
|
1b5b1c4990
|
Merge remote-tracking branch 'remotes/origin/dev'
|
3 years ago |
|
jianjun
|
88ec64694d
|
Merge remote-tracking branch 'remotes/origin/dev_epidemic_situation' into dev
|
3 years ago |
|
jianjun
|
34ad4fd2e9
|
去掉模板里 的黑线
|
3 years ago |
|
jianjun
|
757eb8dbca
|
去掉 高度设置
|
3 years ago |
|
jianjun
|
a18376cc33
|
长度增加
|
3 years ago |
|
jianjun
|
0d2f5578a1
|
忽略字段
|
3 years ago |
|
jianjun
|
4f81a57b24
|
easypoi和easyExcel导出 调整样式基本统一
|
3 years ago |
|
wangxianzhang
|
bbcbd39495
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
yinzuomei
|
8f2b4a2192
|
Merge remote-tracking branch 'origin/dev'
|
3 years ago |
|
wangxianzhang
|
d18c6cfee1
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
|
wangxianzhang
|
bd19ecf9e9
|
线程池包装，去掉重复包装，遗忘
|
3 years ago |
|
yinzuomei
|
d33133c2ae
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
yinzuomei
|
2d0c9323a0
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
3 years ago |
|
yinzuomei
|
b994adfb02
|
bug#2768:user,gov-org
|
3 years ago |
|
zxc
|
2e3042128a
|
更改模板表头颜色
|
3 years ago |
