jianjun
|
4d51759c9e
|
url 多了
|
4 years ago |
|
jianjun
|
eeb7c3c131
|
排名bug up
|
4 years ago |
|
jianjun
|
9114871dce
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
7f0b3b48a0
|
排名bug
|
4 years ago |
zxc
|
bbb97fa7d7
|
emm
|
4 years ago |
|
zxc
|
f53205c35f
|
job修改
|
4 years ago |
|
zxc
|
54fb04fe11
|
位置调整
|
4 years ago |
|
jianjun
|
cb3966ae9e
|
字段名修改
|
4 years ago |
|
jianjun
|
e002f63c66
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
8a319ce5b9
|
Merge branch 'dev_user_grid_work_2_jinan' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
c2505bd8b7
|
字段名修改
|
4 years ago |
|
zxc
|
cde6658534
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
zxc
|
68bc9bc498
|
议题统计优化，获取折线图修改
|
4 years ago |
zhaoqifeng
|
8857ea56cf
|
所有项目列表修改
|
4 years ago |
|
zxc
|
e3b3b139d2
|
加字段名
|
4 years ago |
|
zxc
|
3bfbba6666
|
加字段名
|
4 years ago |
|
jianjun
|
c81d103f28
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_ic_mp
# Conflicts:
# epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
|
4 years ago |
|
jianjun
|
f680eda00a
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
|
jianjun
|
74d9b5b412
|
加上大括号
|
4 years ago |
sunyuchao
|
0ecb3ed8c6
|
加提示编码
|
4 years ago |
|
jianjun
|
541ebe42b0
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
|
jianjun
|
af693ff65c
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_mp
Conflicts:
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java
|
4 years ago |
|
jianjun
|
725566f373
|
事件回复防重复
|
4 years ago |
wangxianzhang
|
b9336c8ee5
|
版本升级
|
4 years ago |
yinzuomei
|
38eeeecee2
|
居民端上报的需求，指派志愿者时，需求人与服务方不能是一个人
|
4 years ago |
|
wangxianzhang
|
0a28102439
|
Merge branch 'dev'
|
4 years ago |
|
wangxianzhang
|
8d7b508c88
|
修改：
1.调整BaseRequestLogAspect，输出请求参数的时候,不打印Request和Response
|
4 years ago |
|
zhaoqifeng
|
36f7e1d87b
|
活动相关接口
|
4 years ago |
|
sunyuchao
|
5879f74dd7
|
Merge branch 'dev_ic_mp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_mp
|
4 years ago |
|
sunyuchao
|
0ce1b0a8b8
|
sql优化
|
4 years ago |
|
zxc
|
d60e31ce99
|
字段名
|
4 years ago |
|
zhaoqifeng
|
083cf37f38
|
活动相关接口
|
4 years ago |
|
zxc
|
4696132e0e
|
emm 缓存
|
4 years ago |
|
sunyuchao
|
1c35c0dedc
|
网格类型字典
|
4 years ago |
|
wangxianzhang
|
472c31694e
|
版本升级
|
4 years ago |
|
wangxianzhang
|
5dd50c7c37
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_dim_sync
|
4 years ago |
|
wangxianzhang
|
0412c9e5e8
|
修改：
1.维度同步，internal&external
|
4 years ago |
|
sunyuchao
|
4d3506b7cd
|
引入路径
|
4 years ago |
|
zxc
|
e780fd7853
|
a
|
4 years ago |
|
sunyuchao
|
fcfc9e50c3
|
引入路径
|
4 years ago |
|
sunyuchao
|
987301ce28
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
|
sunyuchao
|
4c245f3092
|
进网格接口增加网格经纬度返参
|
4 years ago |
|
zxc
|
82fbccf709
|
新增详情
|
4 years ago |
|
wangxianzhang
|
1498870a88
|
修改：
1.指标库维度同步，优化，新增的时候判断是否存在，存在的话则执行修改
|
4 years ago |
|
jianjun
|
47c5518343
|
数据统计 实时项目数据添加项目id 参数
|
4 years ago |
|
jianjun
|
eb3dca8894
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
854dbb41fd
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
e9a1162f04
|
项目实时抽取 添加参数projectId
|
4 years ago |
|
sunyuchao
|
6dbcabc347
|
垃圾
|
4 years ago |
|
zxc
|
da94759408
|
douhao
|
4 years ago |
