jianjun
|
0f25cc3e44
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
1da9e55f04
|
Merge branch 'dev_user_grid_work_2_jinan' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
Conflicts:
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
|
d76b3f26ba
|
例行工作 对接中间库
|
4 years ago |
zhaoqifeng
|
2c5e7e140e
|
活动相关接口
|
4 years ago |
yinzuomei
|
973cf413d3
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
yinzuomei
|
c07bb27e2d
|
user-demand-rel
|
4 years ago |
wangxianzhang
|
684093cdec
|
Merge branch 'dev_ic_mp' into develop
# Conflicts:
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
|
4 years ago |
|
wangxianzhang
|
8d019ff6f4
|
Merge remote-tracking branch 'origin/dev_remove_elinkcloud' into dev_ic_mp
# Conflicts:
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
|
4 years ago |
|
wangxianzhang
|
c72f5bc698
|
Merge remote-tracking branch 'origin/dev_remove_elinkcloud' into develop
# Conflicts:
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
# epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java
# epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java
|
4 years ago |
|
wangxianzhang
|
87c2ed4945
|
解除对易联云的依赖
|
4 years ago |
|
yinzuomei
|
64af120ad3
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
d53f70f444
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
yinzuomei
|
759c42050e
|
/heart/userdemand/pagelist-analysis
|
4 years ago |
|
jianjun
|
d8131fa4e2
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
b68ac17277
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
6fcd1ccdec
|
Merge remote-tracking branch 'remotes/origin/dev_grid_user_work' into develop
|
4 years ago |
|
jianjun
|
a078876d38
|
例行工作 漏掉了一个字段 up
|
4 years ago |
|
jianjun
|
e2c6f3bf8a
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
92a0354b4c
|
Merge remote-tracking branch 'remotes/origin/dev_grid_user_work' into dev
|
4 years ago |
|
jianjun
|
e740e54d73
|
例行工作 漏掉了一个字段
|
4 years ago |
|
jianjun
|
a0e1abec83
|
例行工作 添加2个字段
|
4 years ago |
|
yinzuomei
|
a49052cabc
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
jianjun
|
e674164ea8
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
yinzuomei
|
ca4510ee16
|
我的需求详情
|
4 years ago |
|
jianjun
|
dc9a7df275
|
Merge remote-tracking branch 'remotes/origin/dev_grid_user_work' into dev
|
4 years ago |
|
jianjun
|
70fdee683a
|
Merge remote-tracking branch 'remotes/origin/dev_user_grid_work_2_jinan' into develop
|
4 years ago |
|
jianjun
|
a46320761c
|
添加例行工作 mq 生产者
|
4 years ago |
|
yinzuomei
|
010cc3d3e5
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
yinzuomei
|
9850c10152
|
我的需求
|
4 years ago |
|
yinzuomei
|
21f1128718
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
# Conflicts:
# epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/EvaluateDemandFormDTO.java
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
|
4 years ago |
|
yinzuomei
|
781c85a445
|
居民端发布需求内容+服务评价输入的完成情况走内容审核
|
4 years ago |
|
yinzuomei
|
ea46728d8e
|
居民端发布需求内容+服务评价输入的完成情况走内容审核
|
4 years ago |
|
yinzuomei
|
aa1df89c67
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
yinzuomei
|
c9f6bbb680
|
test
|
4 years ago |
|
yinzuomei
|
8d7a3cf2c4
|
我的需求
|
4 years ago |
|
yinzuomei
|
4bbaa2a4a0
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
yinzuomei
|
c8a9e45c85
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
|
yinzuomei
|
e1b1003678
|
最近预约
|
4 years ago |
zxc
|
7b4d4fc7aa
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
zxc
|
63b99bc7c0
|
小程序端预约列表
|
4 years ago |
|
yinzuomei
|
bd58072b31
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
|
yinzuomei
|
20b31fd842
|
服务方单位名称查询
|
4 years ago |
sunyuchao
|
4dbdb8c864
|
Merge branch 'dev_ic_mp' into develop
|
4 years ago |
|
sunyuchao
|
642cdfd4ae
|
测试代码调整
|
4 years ago |
|
jianjun
|
d32f970d95
|
12312312
|
4 years ago |
|
jianjun
|
23086ce662
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
5883cde166
|
Merge branch 'dev_grid_user_work' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
c675949712
|
脚本错误
|
4 years ago |
|
jianjun
|
600ef60b96
|
Merge remote-tracking branch 'remotes/origin/develop' into release_temp
|
4 years ago |
|
jianjun
|
a2e26a59b7
|
Merge branch 'dev_grid_user_work' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
