zxc
|
d9cbe10fed
|
Merge remote-tracking branch 'origin/dev' into dev_import
|
4 years ago |
jianjun
|
ac140495a1
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
17e604af3d
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
750c2cf50c
|
去掉修改
|
4 years ago |
|
zxc
|
19a992d58c
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_import
|
4 years ago |
|
zxc
|
76877714ac
|
errorInfo
|
4 years ago |
|
jianjun
|
64861d2761
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
45c91b6786
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_query' into dev
|
4 years ago |
zhaoqifeng
|
d9f0e71e90
|
联建活动关联多个单位和服务事项
|
4 years ago |
wangxianzhang
|
f471e3348a
|
Merge branch 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_import
|
4 years ago |
|
wangxianzhang
|
1508e03ba6
|
新增：
1.oss接受导入任务描述文件的接口
修改：
1.居民信息导入，生成excel文件，传送到oss，而不再下载
|
4 years ago |
|
zhaoqifeng
|
2888475ff7
|
联建活动关联多个单位和服务事项
|
4 years ago |
|
zxc
|
ee66d95386
|
常量添加
|
4 years ago |
|
zxc
|
3d13549a8a
|
errInfos
|
4 years ago |
|
wangxianzhang
|
5f277ece78
|
Merge remote-tracking branch 'origin/dev_import' into dev_import
|
4 years ago |
|
wangxianzhang
|
75467a89d8
|
新增：
1.commonservice中导入任务相关的接口
修改：
1.居民信息导入中调用commonservice中的
|
4 years ago |
|
wangxianzhang
|
6230c5dc49
|
微调
|
4 years ago |
yinzuomei
|
b5d6ec8bd4
|
组织网格增加centerAddress中心点位地址
|
4 years ago |
|
yinzuomei
|
462cbfe6b7
|
/gov/org/agency/addagency-v2新增组织，增加中心点位
|
4 years ago |
|
yinzuomei
|
de74af16c5
|
/gov/org/agency/editagency修改组织，增加中心点位
|
4 years ago |
|
yinzuomei
|
1282927f0f
|
/gov/org/grid/editgrid修改网格，增加中心点位
|
4 years ago |
|
wangxianzhang
|
89907988a9
|
版本升级
|
4 years ago |
|
wangxianzhang
|
ba12299dff
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
wangxianzhang
|
0da1035fea
|
修复：
1.居民导入：options缓存问题
|
4 years ago |
|
yinzuomei
|
e554f39c5c
|
/gov/org/grid/addgrid新增网格，增加中心点位
|
4 years ago |
|
yinzuomei
|
e247d78303
|
删除社会组织字典
|
4 years ago |
|
yinzuomei
|
880f21c9b4
|
sys/dict/data/dictlist限制sys_dict_data.del_flag='0'
|
4 years ago |
|
yinzuomei
|
874bf9d6a2
|
/epmetuser/patrolroutinework/add修改 up
|
4 years ago |
|
yinzuomei
|
1818167ffc
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
cef7095969
|
Merge remote-tracking branch 'origin/dev_yushan' into dev
|
4 years ago |
|
yinzuomei
|
9304fe2871
|
/epmetuser/patrolroutinework/add修改
|
4 years ago |
|
jianjun
|
3b0ee39d90
|
例行工作次数 导出
|
4 years ago |
|
jianjun
|
e1dad2a6ce
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
a5b7e0e5e3
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
fa74f114b1
|
例行工作次数 导出
|
4 years ago |
|
jianjun
|
97026501e6
|
bug改一下 例行工作次数 匹配不到 up
|
4 years ago |
|
jianjun
|
300f9f21c7
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
6a8fd02825
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
229ae8ac42
|
bug改一下 例行工作次数 匹配不到
|
4 years ago |
|
jianjun
|
652bb54362
|
agg stats up
|
4 years ago |
|
jianjun
|
7f87ccc0b0
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
d62b5b13a5
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
841c60dc60
|
项目变动粒度缩小为projectId
|
4 years ago |
|
wangxianzhang
|
d12732f0ed
|
版本升级
|
4 years ago |
|
wangxianzhang
|
9a1fe7c67b
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
wangxianzhang
|
2d2969f08c
|
Merge branch 'wxz_resiimport_optimize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
yinzuomei
|
002fd53fed
|
yushan up:user+project
|
4 years ago |
|
yinzuomei
|
fa34dfb9da
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
wangxianzhang
|
79f4a9ea5f
|
修复：
- 居民导入：附加信息表中，判断是否为新增用户的逻辑错误
|
4 years ago |
|
yinzuomei
|
e4653e1d8f
|
冲突
|
4 years ago |
