25270 Commits (d4961c542a3ddab0c1b4e01e8d965fd8ccb9a62c)
 

Author SHA1 Message Date
wxz f4f89692ff 1.统一调整Logback日志输出目录,执行jvm参数传入。默认./logs/myservice。参数指定方式:-Dlog.dir=/Volumes/data/epmetlog,则会打印到/Volumes/data/epmetlog/myservice 2 years ago
yinzuomei d8c4752ea6 列表 2 years ago
yinzuomei 606b43f809 安全负责人! 2 years ago
yinzuomei 0f936dc05f Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master 2 years ago
yinzuomei e650c3cedc /gov/org/customeragency/agencygridtreeV2 2 years ago
wxz 0c5c4cd98f 1.修改:兼容老的人群类型 2 years ago
wxz 7ae4a5199c Merge branch 'master' into lingshan_master 2 years ago
wxz 53acd4d5fc 1.增加:EpmetUserRemoteService用于获取当前登录用户基础缓存 2 years ago
wxz b5b9704c71 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master 2 years ago
wxz 128f20c00e 1.修改:特殊人群跟居民信息里的特殊人群挂钩。2:修复:下载的时候下载的xls而不是xlsx 2 years ago
yinzuomei 8983c14465 test 2 years ago
wxz d856a33edb 1.修改:居民信息导入,只更新已填写的、(意思就是,上次我填了第一列第二列,提交了。这次我只填了第三第四列,第一第二列空着,那这次我导入之后4列都有值,而不是把1,2列更新为空) 2 years ago
wxz 7b684d485f Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud 2 years ago
yinzuomei a3d574ee0b try 2 years ago
yinzuomei e75c12e0df try 2 years ago
wxz 2c2d2871da Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master 2 years ago
yinzuomei a280d216cc Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master 2 years ago
yinzuomei 0f72b76376 企业的所属组织,可以是网格,可以是社区,可以是街道.... 2 years ago
wxz bdf2eb1812 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master 2 years ago
wxz ff79f02ef8 1.fix:特殊人群,调整, 2 years ago
yinzuomei 94392b0399 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master 2 years ago
yinzuomei f550f1fcb9 导入没改完,需求变了 2 years ago
wxz e5ba6a44fa Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master 2 years ago
wxz 2c716ada8a 1.修改:特殊人群,调整,直接关联居民信息。 2 years ago
yinzuomei 9f1833d9bb 灵山企业档案=原产品重点危化品企业;导出,导入模板调整 2 years ago
yinzuomei 7ddf1d66ac 灵山企业档案=原产品重点危化品企业 2 years ago
wxz 93e9ef9249 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master 2 years ago
yinzuomei ade30d50cd Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into lingshan_master 2 years ago
yinzuomei eae97f663f 场所类型、场所类别不设置示例 2 years ago
yinzuomei a895977559 规模请正确填写场所人数;模板增加示例 2 years ago
yinzuomei 12851dcae5 修复安全生产巡查导入,场所区域为网格名称 2 years ago
yinzuomei b8d818824c 修复安全生产巡查导入,规模必须填入数字。 2 years ago
yinzuomei b39fe4bb2e 修复安全生产巡查,拟复查时间不能置空,且自动带入的问题 2 years ago
yinzuomei 8864442f8e 信息采集审核bug修改:暂存一下,要去改别的bug了 2 years ago
wxz 3114ebb219 1.新增:特殊人员导入模板下载 2 years ago
wxz 30d879068d 1.新增:删除特殊人员信息。2.将创建接口,改为保存接口,同时支持创建和修改 2 years ago
wxz 5ecc91771f 1.新增:删除特殊人员信息。2.将创建接口,改为保存接口,同时支持创建和修改 2 years ago
luyan 6678154471 社区服务,修改公共服务管理排序规则,依据服务事件倒序; 2 years ago
wxz c11afec4bd 调整 2 years ago
wxz 7575c928b8 1.新增:特殊人群-新增。2.新增:特殊人群详情。3.新增:特殊人群详情 2 years ago
wxz 7a96333922 增加导入记录按照id查询 2 years ago
wxz 54695bfee9 完成灵山社会维稳导入 2 years ago
wxz 1fb9e524cd Merge branch 'wxz_importtask_addnumber' into lingshan_master 2 years ago
wxz bee92b0ce8 1 2 years ago
wxz a99c14d85a 1.修改:import task 增加成功条数和失败条数 2 years ago
wxz 23295fd158 【灵山街道】1.导入接口,增加表头预校验 2 years ago
wxz 8e6bc27e98 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master 2 years ago
wxz 01717d97d8 【灵山街道】1.新增导入接口,完成一半 2 years ago
luyan 44208966ac 控制台打印转换为log.info(),修改参数常量 2 years ago
wxz 960e252cec 【灵山大屏】1.修改:orgmap接口调整,使用EpmetRequestHolder代替@LoginUser注解。 2 years ago