zhaoqifeng
|
a75e24bca6
|
Merge branch 'dev'
|
3 years ago |
|
zhaoqifeng
|
6f7fc3ce5c
|
Merge branch 'dev_costumer_init' into dev
|
3 years ago |
wangxianzhang
|
7b61020ac6
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
jianjun
|
15bfc86987
|
添加公司私服地址 及发布配置
|
3 years ago |
|
jianjun
|
22a23c7b99
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
jianjun
|
a7421195f3
|
Merge remote-tracking branch 'remotes/origin/dev'
|
3 years ago |
|
jianjun
|
4b1f3633b3
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
jianjun
|
09f8f47bb3
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
|
jianjun
|
5509da011a
|
错误信息
|
3 years ago |
|
jianjun
|
9a2e8b31f8
|
修改单元数bug
|
3 years ago |
|
zhaoqifeng
|
116555cb81
|
Merge branch 'dev'
|
3 years ago |
|
zhaoqifeng
|
9099476b61
|
Merge branch 'dev_bugfix_ljj' into dev
|
3 years ago |
|
zhaoqifeng
|
a20562d78b
|
楼栋编辑单元数时，从头开始新增单元，如果原先已存在，则略过
|
3 years ago |
zxc
|
3d029d9b14
|
Merge remote-tracking branch 'origin/dev'
|
3 years ago |
|
zxc
|
d29939299b
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
3 years ago |
|
zxc
|
23fecfa3a6
|
错误信息具体化
|
3 years ago |
|
wangxianzhang
|
c5f17dc169
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
5c91f43ab9
|
-
|
3 years ago |
|
wangxianzhang
|
beb35718d8
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
a3cfc504c1
|
居民信息导入：校验所有列的必填；只校验第一次出现的填了但系统中找不到的列
|
3 years ago |
|
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 |
|
zhaoqifeng
|
8d951e4a9b
|
客户初始化数字社区方法统一入口
|
3 years ago |
|
jianjun
|
e347298448
|
初始化item时 缺少的字段
|
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 |
