zxc
|
e869adc73f
|
emm
|
4 years ago |
yinzuomei
|
42cb5d2af0
|
Merge remote-tracking branch 'origin/dev_resi_event' into dev_resi_event
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
|
4 years ago |
|
yinzuomei
|
7693814bf0
|
暂存提交下
|
4 years ago |
|
zxc
|
cc7b6d4a2d
|
接口框
|
4 years ago |
|
zxc
|
da4c6b7429
|
抓紧提交 不合代码
|
4 years ago |
|
zxc
|
33bc6098ab
|
emm 赶紧提交 省着和代码
|
4 years ago |
wxz
|
7ea91ecdcb
|
Merge branch 'dev_resi_event' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_resi_event
|
4 years ago |
|
wxz
|
0f003b38ad
|
新增：我要报事-查询人大代表列表
|
4 years ago |
|
yinzuomei
|
63641531e8
|
resieventreply
|
4 years ago |
|
yinzuomei
|
ad21a4eea5
|
tinyint(1)=>Boolean
|
4 years ago |
|
yinzuomei
|
16345ea5ae
|
代码生成提交，只放了事件和回复两个主表的controller
|
4 years ago |
|
yinzuomei
|
d154c172b2
|
新增resi_event_XXX表，建表语句
|
4 years ago |
|
wxz
|
973948cd41
|
增加报事的controller,service
|
4 years ago |
jianjun
|
503e4f1ecf
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
7a528c5fa2
|
告警时间转换错误
|
4 years ago |
|
yinzuomei
|
99e2ce1be9
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
c8e013f936
|
Merge remote-tracking branch 'origin/dev_ui_upgrade' into dev
|
4 years ago |
|
yinzuomei
|
034015f4f7
|
>8000的错误码提示给用户。
|
4 years ago |
zhaoqifeng
|
8026023c5b
|
积分排行UI变更设计，添加头像
|
4 years ago |
|
wxz
|
445c1d6f23
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_healthcheck
|
4 years ago |
|
wxz
|
378f57dceb
|
增加健康检查controller
|
4 years ago |
|
yinzuomei
|
1efc81fab5
|
治理指数-网格fact_grid_govern_daily抽取失败bugfix
|
4 years ago |
|
wxz
|
36e273a96b
|
调整PageHelper.startpage()位置，防止线程变量残留问题
|
4 years ago |
|
yinzuomei
|
89d915ab9d
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
ffe4244b0e
|
applycreategroup
|
4 years ago |
|
yinzuomei
|
8e9270bd3b
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
2e633c1c5c
|
grid_latest：customer_id+grid_id+customer_user_id应唯一
|
4 years ago |
|
yinzuomei
|
b505ff9d38
|
Format specifier '%s'
|
4 years ago |
|
yinzuomei
|
9f17ce9a38
|
Merge remote-tracking branch 'origin/dev_special_subject' into dev
|
4 years ago |
|
zxc
|
b1ba7f6b63
|
又一次优化☹️
|
4 years ago |
|
yinzuomei
|
1668fff90c
|
review代码时加的注释
|
4 years ago |
|
zxc
|
7524b879b0
|
..
|
4 years ago |
|
zxc
|
0da5164320
|
emm
|
4 years ago |
|
jianjun
|
e7a4775f24
|
内容审核日志打印优化
|
4 years ago |
|
jianjun
|
d1d41d7e35
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
e14dfb4da7
|
内容审核日志打印优化
|
4 years ago |
|
zxc
|
e220b22c7c
|
..
|
4 years ago |
|
zxc
|
13335b286d
|
去重
|
4 years ago |
|
zhaoqifeng
|
d387d96b0b
|
党群议事UI变更设计
|
4 years ago |
|
zxc
|
df12e5cc9e
|
再次优化🙁
|
4 years ago |
|
yinzuomei
|
3942eb034d
|
barKey.trim
|
4 years ago |
|
wxz
|
49a74658f8
|
增加http健康检查接口
|
4 years ago |
|
jianjun
|
d04e0356dc
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_special_subject
|
4 years ago |
|
yinzuomei
|
3b0d30b014
|
syncfootbar4customer
|
4 years ago |
|
yinzuomei
|
296bdbe0ad
|
Merge branches 'dev' and 'dev_ui_upgrade' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ui_upgrade
Conflicts:
epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java
|
4 years ago |
|
wxz
|
07823edf01
|
Merge branches 'dev' and 'wxz_thread_var_clean' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_thread_var_clean
|
4 years ago |
|
wxz
|
776712c019
|
Merge branches 'dev' and 'wxz_feign_exception_show' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_feign_exception_show
|
4 years ago |
|
wxz
|
5df3664c7d
|
Merge branches 'dev' and 'wxz_feign_datetime' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_feign_datetime
Conflicts:
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/ExceptionUtils.java
|
4 years ago |
|
yinzuomei
|
20abf657a3
|
by
|
4 years ago |
|
yinzuomei
|
ab0cd0727f
|
JILUREN
|
4 years ago |
