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

25858 Commits (d873128a32864e3ccf02b0b67f76e4baccfb6a4d)
 

Author SHA1 Message Date
wxz 927b4e5fd4 1.fix:特殊人群导入模板有问题
2 years ago
yinzuomei 9329e013a7 Merge remote-tracking branch 'origin/lingshan_master' into dev
2 years ago
yinzuomei de31cf49e5 updateArticle
2 years ago
yinzuomei 068e6e35d9 Merge remote-tracking branch 'origin/lingshan_master' into dev
2 years ago
yinzuomei 97c11ef229 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
2 years ago
yinzuomei 200527744c updateArticle
2 years ago
wxz d513516d5c Merge branch 'lingshan_master' into dev
2 years ago
wxz b8136cbb6f fix
2 years ago
wxz 8a10311285 Merge branch 'lingshan_master' into dev
2 years ago
wxz 7d1272c54e Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
2 years ago
wxz 8fadcea4d4 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
2 years ago
yinzuomei c0bd3b7549 Merge remote-tracking branch 'origin/lingshan_master' into dev
2 years ago
wxz a3ed8c0350 fix:【灵山-特殊人群】修改接口，修复类别变更，忘记删除旧类别的bug
2 years ago
yinzuomei 6284baa3d2 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
2 years ago
yinzuomei fe0536f36b updateArticle
2 years ago
wxz 96b8a4bccc Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
2 years ago
wxz f88ac1630d fix
2 years ago
yinzuomei d9326a8afd Merge remote-tracking branch 'origin/lingshan_master' into dev
2 years ago
yinzuomei 580e64ce9a /gov/voice/draft/detailV2区分内容和附件
2 years ago
yinzuomei 5c933863b4 /gov/voice/article/detailV2区分内容和附件
2 years ago
yinzuomei 906d12e118 Merge remote-tracking branch 'origin/lingshan_master' into dev
2 years ago
yinzuomei fd32302b60 所属栏目不能为空 暂时注释
2 years ago
yinzuomei 2f79e175e6 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
2 years ago
yinzuomei 09e20f709d 党建声音发布支持上传文件
2 years ago
wxz 8af03f655a 1.修改：【灵山大屏-党建宣传】列表-增加category参数，传递一级栏目id，查询该栏目下的文章。2.修改：【灵山大屏】文章详情，增加categroy和categoryName的返回
2 years ago
wxz e0c8a124a6 Merge branch 'lingshan_master' into dev
2 years ago
wxz 0b99c1e16b Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
2 years ago
wxz 758c77c7cf 1.fix
2 years ago
wxz 9bbb469749 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
2 years ago
wxz 537ef0c4cc Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master
2 years ago
wxz f4f89692ff 1.统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice
2 years ago
yinzuomei 37b36f9d48 Merge remote-tracking branch 'origin/lingshan_master' into dev
2 years ago
yinzuomei d8c4752ea6 列表
2 years ago
yinzuomei 606b43f809 安全负责人！
2 years ago
yinzuomei e35e4b14b0 Merge remote-tracking branch 'origin/lingshan_master' into dev
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 fa90ba0d7f Merge branch 'lingshan_master' into dev
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 1bd715bab0 Merge branch 'lingshan_master' into dev
2 years ago
wxz 885aeea8d6 Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
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 9f01253363 Merge remote-tracking branch 'origin/lingshan_master' into dev
2 years ago
yinzuomei 8983c14465 test
2 years ago
wxz 9e7849c07b Merge remote-tracking branch 'origin/dev' into dev
2 years ago
wxz 48dae94d89 Merge branch 'wxz_resiinfo_import_fix' into dev
2 years ago
wxz d856a33edb 1.修改：居民信息导入，只更新已填写的、（意思就是，上次我填了第一列第二列，提交了。这次我只填了第三第四列，第一第二列空着，那这次我导入之后4列都有值，而不是把1，2列更新为空）
2 years ago