jianjun
|
a1ef3b275c
|
合并的错误
|
4 years ago |
|
jianjun
|
9f40a3f1b3
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
adb42606f1
|
Merge branch 'dev_ic_mp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
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
|
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
|
bd5d2f4f5b
|
Merge branch 'dev_ic_mp' into develop
|
4 years ago |
|
sunyuchao
|
0ecb3ed8c6
|
加提示编码
|
4 years ago |
|
jianjun
|
47d7b93740
|
Merge branch 'dev_ic_mp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
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 |
|
jianjun
|
0b3d2ae316
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
95c76118d5
|
Merge branch 'dev_upgrade_mybatis_plus' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
c8135d7a9c
|
同步升级 plus-annotation版本
|
4 years ago |
yinzuomei
|
2a554ed25c
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yinzuomei
|
d237d8b140
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
yinzuomei
|
38eeeecee2
|
居民端上报的需求，指派志愿者时，需求人与服务方不能是一个人
|
4 years ago |
wangxianzhang
|
8d7b508c88
|
修改：
1.调整BaseRequestLogAspect，输出请求参数的时候,不打印Request和Response
|
4 years ago |
zhaoqifeng
|
ccec9c79d6
|
Merge branch 'dev_ic_mp' into develop
|
4 years ago |
|
zhaoqifeng
|
36f7e1d87b
|
活动相关接口
|
4 years ago |
|
yinzuomei
|
8b8df4648f
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
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
|
9b82cd8e4d
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
d60e31ce99
|
字段名
|
4 years ago |
|
zhaoqifeng
|
8eb27230c9
|
Merge branch 'dev_ic_mp' into develop
|
4 years ago |
|
zhaoqifeng
|
083cf37f38
|
活动相关接口
|
4 years ago |
|
zxc
|
0b4c38bd2d
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
4696132e0e
|
emm 缓存
|
4 years ago |
|
sunyuchao
|
2bfc6f7ae7
|
Merge branch 'dev_ic_mp' into develop
|
4 years ago |
|
sunyuchao
|
1c35c0dedc
|
网格类型字典
|
4 years ago |
|
wangxianzhang
|
9bbce77606
|
Merge branch 'wxz_dim_sync' into develop
|
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
|
6e19f175a1
|
Merge branch 'dev_ic_mp' into develop
|
4 years ago |
|
sunyuchao
|
4d3506b7cd
|
引入路径
|
4 years ago |
|
zxc
|
7ac2475d28
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
zxc
|
00a098be8b
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
e780fd7853
|
a
|
4 years ago |
|
sunyuchao
|
fcfc9e50c3
|
引入路径
|
4 years ago |
|
zxc
|
b2e8c80e46
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
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
|
ce31b7f57a
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
zxc
|
82fbccf709
|
新增详情
|
4 years ago |
|
wangxianzhang
|
70911cc615
|
Merge remote-tracking branch 'origin/wxz_dim_sync' into develop
|
4 years ago |
|
wangxianzhang
|
1498870a88
|
修改：
1.指标库维度同步，优化，新增的时候判断是否存在，存在的话则执行修改
|
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 |
