jianjun
|
34e96e5682
|
空指针的bug
|
4 years ago |
|
jianjun
|
da97b6809e
|
url 多了 up
|
4 years ago |
|
jianjun
|
a179b0e80c
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
d1c74f852c
|
Merge remote-tracking branch 'remotes/origin/dev_user_grid_work_2_jinan' into dev
|
4 years ago |
|
jianjun
|
4d51759c9e
|
url 多了
|
4 years ago |
|
jianjun
|
0e0a23739d
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
162fef064b
|
Merge remote-tracking branch 'remotes/origin/dev_hotfix' into develop
|
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
|
a4fd7c4d75
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
bbb97fa7d7
|
emm
|
4 years ago |
|
zxc
|
9d28a657c4
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
# Conflicts:
# epmet-module/epmet-job/epmet-job-server/pom.xml
|
4 years ago |
|
zxc
|
f53205c35f
|
job修改
|
4 years ago |
|
zxc
|
2d16d38554
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
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 |
zhaoqifeng
|
610c5c7880
|
Merge remote-tracking branch 'origin/develop' into develop
|
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 |
|
zhaoqifeng
|
fa0bccf94d
|
Merge branch 'dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
2f8b33a407
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
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
|
198fdcfc33
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
zxc
|
e3b3b139d2
|
加字段名
|
4 years ago |
|
zxc
|
ce113f5e82
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
zxc
|
3bfbba6666
|
加字段名
|
4 years ago |
|
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 |
wangxianzhang
|
b9336c8ee5
|
版本升级
|
4 years ago |
|
yinzuomei
|
38eeeecee2
|
居民端上报的需求，指派志愿者时，需求人与服务方不能是一个人
|
4 years ago |
|
wangxianzhang
|
0a28102439
|
Merge branch 'dev'
|
4 years ago |
