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

25824 Commits (38f26f02cc7f74c9f61e99f635e2d2d7bccb355c)
 

Author SHA1 Message Date
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
wxz 7b684d485f Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
2 years ago
yinzuomei 74f085ba7a Merge remote-tracking branch 'origin/lingshan_master' into dev
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 89e04c670f Merge branch 'lingshan_master' into dev
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 fac408bfa3 Merge branch 'lingshan_master' into dev
2 years ago
wxz ccd8da706e Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
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 56dacf760c Merge remote-tracking branch 'origin/lingshan_master' into dev
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 1e6862f986 烟台：九小场所巡查导入模板名称修改
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 0e8ac2c547 Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into yantai_zhengwu_master
2 years ago
yinzuomei 20ddd2fe19 Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
2 years ago
yinzuomei eae97f663f 场所类型、场所类别不设置示例
2 years ago
yinzuomei 2126aa840e Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
2 years ago
yinzuomei a895977559 规模请正确填写场所人数；模板增加示例
2 years ago
yinzuomei 6ad50d51aa Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
2 years ago
yinzuomei 12851dcae5 修复安全生产巡查导入，场所区域为网格名称
2 years ago
yinzuomei b7fb7405b0 Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
2 years ago
yinzuomei b8d818824c 修复安全生产巡查导入，规模必须填入数字。
2 years ago
yinzuomei 4289a2037c Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
2 years ago
yinzuomei b39fe4bb2e 修复安全生产巡查，拟复查时间不能置空，且自动带入的问题
2 years ago
yinzuomei 0327b88f73 Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
2 years ago