yinzuomei
|
9d89d35a6f
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
zxc
|
6f58e3565e
|
Merge remote-tracking branch 'origin/dev_special_subject' into develop
|
4 years ago |
jianjun
|
460599f156
|
Revert "标签添加颜色字段；"
This reverts commit f2769bb1
|
4 years ago |
|
jianjun
|
f2769bb15c
|
标签添加颜色字段；
|
4 years ago |
|
zxc
|
e7cd67a732
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
zhaoqifeng
|
f49e0c52b4
|
专题管理-热门标签
|
4 years ago |
|
yinzuomei
|
ae054cf0ee
|
hot-subject-taglist
|
4 years ago |
|
yinzuomei
|
7ac27bcf5a
|
Merge remote-tracking branch 'origin/dev_special_subject' into develop
|
4 years ago |
|
yinzuomei
|
0c057d0866
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
yinzuomei
|
eb41373dfe
|
议题发表建议限制必填
|
4 years ago |
sunyuchao
|
fab6c613f8
|
Merge branch 'dev_special_subject' into develop
|
4 years ago |
|
zhaoqifeng
|
00223ce39c
|
专题管理-热门标签
|
4 years ago |
|
zhaoqifeng
|
ed65e9d402
|
专题管理-热门标签
|
4 years ago |
|
sunyuchao
|
fdff195cdb
|
专题-组织网格数
|
4 years ago |
|
zxc
|
3b515330f6
|
Merge remote-tracking branch 'origin/dev_special_subject' into develop
|
4 years ago |
|
zxc
|
4e30e5544d
|
专题文章列表，专题列表
|
4 years ago |
|
zxc
|
3026be62aa
|
专题文章列表，专题列表
|
4 years ago |
|
yinzuomei
|
e0e060fa60
|
注释
|
4 years ago |
|
yinzuomei
|
98ce45250b
|
commit4
|
4 years ago |
|
yinzuomei
|
079267b71f
|
commit3
|
4 years ago |
|
sunyuchao
|
8a699cecd0
|
Merge branch 'dev_bug_syc' into develop
|
4 years ago |
|
sunyuchao
|
44944da978
|
党建园地-已结案项目议题列表sql调整
|
4 years ago |
|
yinzuomei
|
ea90b26e2b
|
commit3
|
4 years ago |
|
yinzuomei
|
b619ec965c
|
Merge remote-tracking branch 'origin/dev_special_subject' into dev_special_subject
# Conflicts:
# epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
# epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
|
4 years ago |
|
yinzuomei
|
807c4bf1d3
|
commit2
|
4 years ago |
|
zxc
|
3b0d487ee7
|
Merge remote-tracking branch 'origin/dev_special_subject' into develop
|
4 years ago |
|
zxc
|
61a87b08f7
|
根据gridId查询pids
|
4 years ago |
|
sunyuchao
|
8c52ea01ff
|
Merge branch 'dev_bug_syc' into develop
|
4 years ago |
|
yinzuomei
|
157007fa5c
|
commit
|
4 years ago |
|
sunyuchao
|
f6b2934e3f
|
居民端党建园地 获取结案项目对应议题列表bug修改
|
4 years ago |
wxz
|
a8ba6778a3
|
Merge branch 'wxz_rocketmq_reg' into dev
|
4 years ago |
|
jianjun
|
9bb73ba532
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
6cce31ad4a
|
外部接口鉴权 401打印日志
|
4 years ago |
|
jianjun
|
6ced193d85
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
a385b9cfb3
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
cda3b50e22
|
外部接口鉴权 401打印日志
|
4 years ago |
|
yinzuomei
|
99427337ce
|
专题代码出示提交，sql脚本提交
|
4 years ago |
|
sunyuchao
|
f29db06a7b
|
Merge branch 'dev_special_topic' into develop
|
4 years ago |
|
jianjun
|
065379672c
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
sunyuchao
|
9b1eda163a
|
部分方法停用
|
4 years ago |
|
jianjun
|
c46b6043a6
|
外部接口鉴权 加强 🈲️乱调用
|
4 years ago |
|
sunyuchao
|
9f252686e1
|
Merge branch 'dev_special_topic' into develop
|
4 years ago |
|
sunyuchao
|
395a2294fe
|
定时任务增加入参执行
|
4 years ago |
|
wxz
|
a1a9f853a2
|
Merge branch 'wxz_feign_exception_show' into develop
|
4 years ago |
|
wxz
|
b3cc5c0be8
|
gov-access开始改用FallbackFactory
|
4 years ago |
|
sunyuchao
|
bd3a18a0cf
|
Merge branch 'dev_special_topic' into develop
|
4 years ago |
|
sunyuchao
|
9d27eca645
|
小组总数热议话题单独拆除定时任务，凌晨三点执行
|
4 years ago |
|
wxz
|
19619c886c
|
Merge branch 'wxz_feign_exception_show' into develop
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/ExceptionUtils.java
|
4 years ago |
|
wxz
|
9eecb70e18
|
尝试使用FeignCLientFallbackFactory方式调用datastatistical
|
4 years ago |
|
wxz
|
a230c99dea
|
Merge branch 'wxz_rocketmq_reg' into develop
|
4 years ago |
