elink-star
/
epmet-cloud-lingshan
forked from zhangyuan/epmet-cloud-lingshan
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
25137 Commits
1 Branch
0 Tags
147 MiB
Tree: 927b4e5fd4
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '927b4e5fd4'
${ noResults }
Commit Graph

25137 Commits (927b4e5fd4e2d65169e02f3c5ca17d28085d0d1b)
 

Author SHA1 Message Date
wxz 927b4e5fd4 1.fix:特殊人群导入模板有问题
3 years ago
wxz b8136cbb6f fix
3 years ago
wxz 8fadcea4d4 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
3 years ago
wxz a3ed8c0350 fix:【灵山-特殊人群】修改接口，修复类别变更，忘记删除旧类别的bug
3 years ago
yinzuomei 6284baa3d2 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
3 years ago
yinzuomei fe0536f36b updateArticle
3 years ago
wxz 96b8a4bccc Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
3 years ago
wxz f88ac1630d fix
3 years ago
yinzuomei 580e64ce9a /gov/voice/draft/detailV2区分内容和附件
3 years ago
yinzuomei 5c933863b4 /gov/voice/article/detailV2区分内容和附件
3 years ago
yinzuomei fd32302b60 所属栏目不能为空 暂时注释
3 years ago
yinzuomei 2f79e175e6 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
3 years ago
yinzuomei 09e20f709d 党建声音发布支持上传文件
3 years ago
wxz 8af03f655a 1.修改：【灵山大屏-党建宣传】列表-增加category参数，传递一级栏目id，查询该栏目下的文章。2.修改：【灵山大屏】文章详情，增加categroy和categoryName的返回
3 years ago
wxz 758c77c7cf 1.fix
3 years ago
wxz 9bbb469749 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
3 years ago
wxz 537ef0c4cc Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master
3 years ago
wxz f4f89692ff 1.统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice
3 years ago
yinzuomei d8c4752ea6 列表
3 years ago
yinzuomei 606b43f809 安全负责人！
3 years ago
yinzuomei 0f936dc05f Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
3 years ago
yinzuomei e650c3cedc /gov/org/customeragency/agencygridtreeV2
3 years ago
wxz 0c5c4cd98f 1.修改：兼容老的人群类型
3 years ago
wxz 7ae4a5199c Merge branch 'master' into lingshan_master
3 years ago
wxz 53acd4d5fc 1.增加：EpmetUserRemoteService用于获取当前登录用户基础缓存
3 years ago
wxz b5b9704c71 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
3 years ago
wxz 128f20c00e 1.修改：特殊人群跟居民信息里的特殊人群挂钩。2：修复：下载的时候下载的xls而不是xlsx
3 years ago
yinzuomei 8983c14465 test
3 years ago
wxz d856a33edb 1.修改：居民信息导入，只更新已填写的、（意思就是，上次我填了第一列第二列，提交了。这次我只填了第三第四列，第一第二列空着，那这次我导入之后4列都有值，而不是把1，2列更新为空）
3 years ago
wxz 7b684d485f Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
3 years ago
yinzuomei a3d574ee0b try
3 years ago
yinzuomei e75c12e0df try
3 years ago
wxz 2c2d2871da Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master
3 years ago
yinzuomei a280d216cc Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
3 years ago
yinzuomei 0f72b76376 企业的所属组织，可以是网格，可以是社区，可以是街道....
3 years ago
wxz bdf2eb1812 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
3 years ago
wxz ff79f02ef8 1.fix：特殊人群，调整，
3 years ago
yinzuomei 94392b0399 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
3 years ago
yinzuomei f550f1fcb9 导入没改完，需求变了
3 years ago
wxz e5ba6a44fa Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master
3 years ago
wxz 2c716ada8a 1.修改：特殊人群，调整，直接关联居民信息。
3 years ago
yinzuomei 9f1833d9bb 灵山企业档案=原产品重点危化品企业；导出，导入模板调整
3 years ago
yinzuomei 7ddf1d66ac 灵山企业档案=原产品重点危化品企业
3 years ago
wxz 93e9ef9249 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master
3 years ago
yinzuomei ade30d50cd Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into lingshan_master
3 years ago
yinzuomei eae97f663f 场所类型、场所类别不设置示例
3 years ago
yinzuomei a895977559 规模请正确填写场所人数；模板增加示例
3 years ago
yinzuomei 12851dcae5 修复安全生产巡查导入，场所区域为网格名称
3 years ago
yinzuomei b8d818824c 修复安全生产巡查导入，规模必须填入数字。
3 years ago
yinzuomei b39fe4bb2e 修复安全生产巡查，拟复查时间不能置空，且自动带入的问题
3 years ago