sunyuchao
|
42d6fcb597
|
Revert "市北议题数据分两种来源话题和直接的议题，次表数据最少议题的一条，最多分为话题议题两条"
This reverts commit 0854a39b
|
4 years ago |
|
sunyuchao
|
0854a39b1a
|
市北议题数据分两种来源话题和直接的议题，次表数据最少议题的一条，最多分为话题议题两条
|
4 years ago |
jianjun
|
fb82842e1c
|
Merge remote-tracking branch 'remotes/origin/dev' into shibei_master
|
4 years ago |
|
jianjun
|
5b2767c27a
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into shibei_master
|
4 years ago |
yinzuomei
|
034cf8e533
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
444a169393
|
居民信息里列表分类赋值修改
|
4 years ago |
|
yinzuomei
|
c7e769c08b
|
注释日志
|
4 years ago |
|
sunyuchao
|
dd321b33a8
|
Merge branch 'dev_bug_issue_syc' into shibei_master
|
4 years ago |
|
sunyuchao
|
6362e43078
|
市北赋能平台查询议题创建人姓名，因没有上传userWechat表 所以改去userbaseinfo表查询
|
4 years ago |
|
jianjun
|
09dfcc284f
|
添加 获取网格工作人员接口 加上客户Id
|
4 years ago |
|
jianjun
|
d7a085d0df
|
添加 获取网格工作人员接口 -》目前是给平阴集成平台使用 总数不对
|
4 years ago |
|
jianjun
|
2c6c332c8e
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
yinzuomei
|
6ee54df764
|
居民列表查询
|
4 years ago |
|
sunyuchao
|
c68a21cf09
|
Merge branch 'dev_bug_syc' into shibei_master
|
4 years ago |
|
sunyuchao
|
39cbf31b83
|
议题详情议题人取成话题人问题
|
4 years ago |
|
jianjun
|
0f3c05f8d7
|
point 配置错误
|
4 years ago |
|
jianjun
|
5ed2ee17bf
|
Merge remote-tracking branch 'remotes/origin/dev_py_gridmember' into dev
|
4 years ago |
|
jianjun
|
6b9804fa6a
|
heart 没有配置拦截
|
4 years ago |
|
yinzuomei
|
8062dda2b4
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
853f6c1d19
|
个人档案-上报时间，按上报时间降序
|
4 years ago |
|
yinzuomei
|
15f169f19b
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
655c534c40
|
已经占用的编码也不能再使用
|
4 years ago |
|
yinzuomei
|
bf494e34c1
|
需求分类名称唯一。
|
4 years ago |
|
sunyuchao
|
7250f24692
|
市北项目分类单独处理
|
4 years ago |
|
sunyuchao
|
02d469cd41
|
Merge branch 'dev_bug_syc' into shibei_master
|
4 years ago |
|
sunyuchao
|
afb211a08e
|
bug修改
|
4 years ago |
|
jianjun
|
81a60cec0a
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into shibei_master
|
4 years ago |
|
jianjun
|
2feb177267
|
优化插入 分批一次1000
|
4 years ago |
|
jianjun
|
95f1be09a2
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into shibei_master
|
4 years ago |
|
jianjun
|
932dd734fc
|
项目数据统计分批查询1w 试下
|
4 years ago |
|
jianjun
|
9033087896
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
49639d6d19
|
获取当前组织下的工作人员 组织/部门/网格下人员列表 【组织添加的工作人员】
|
4 years ago |
|
jianjun
|
638ed491c0
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into shibei_master
|
4 years ago |
|
jianjun
|
7ba2f4d99e
|
获取当前组织下的工作人员 组织/部门/网格下人员列表
|
4 years ago |
wangxianzhang
|
dbe6ae2fb0
|
修改：
1.resi-home/resi-hall的hystrix最大线程个数
|
4 years ago |
|
jianjun
|
02739c4154
|
Merge remote-tracking branch 'remotes/origin/dev_upgrade_mybatis_plus' into shibei_master
|
4 years ago |
|
jianjun
|
052a3e64b2
|
Merge remote-tracking branch 'remotes/origin/dev_upgrade_mybatis_plus' into dev
|
4 years ago |
|
jianjun
|
ec47ae90c1
|
merege
|
4 years ago |
|
jianjun
|
c01c436129
|
Merge remote-tracking branch 'remotes/origin/dev_shibei_task' into shibei_master
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java
|
4 years ago |
|
jianjun
|
9db1ab0b60
|
数字社区单独部署 支持的定时任务 拆分2个任务
|
4 years ago |
|
jianjun
|
78f493cee9
|
数字社区单独部署 支持的定时任务 拆分2个任务
|
4 years ago |
|
jianjun
|
81aa2ebe73
|
Merge branch 'dev_py_gridmember' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_py_gridmember
|
4 years ago |
|
jianjun
|
e9840e3b05
|
Merge branch 'dev_shibei_task' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_py_gridmember
|
4 years ago |
|
jianjun
|
7ecdff5382
|
数字社区单独部署 支持的定时任务
|
4 years ago |
|
jianjun
|
e7fb45b949
|
数字社区单独部署 支持的定时任务
|
4 years ago |
|
jianjun
|
bcd20d0148
|
获取网格内工作人员 去掉客户id
|
4 years ago |
|
jianjun
|
3bbb9ca3e4
|
获取网格内工作人员 UP
|
4 years ago |
|
jianjun
|
d992dc54f7
|
获取网格内工作人员 UP
|
4 years ago |
|
jianjun
|
8547d47c78
|
获取网格内工作人员
|
4 years ago |
|
jianjun
|
3c6c7f3af8
|
gateway添加外部白名单
|
4 years ago |
