jianjun
|
91bd27cf39
|
这些事不正常的
|
4 years ago |
zxc
|
b97dca6629
|
emm
|
4 years ago |
|
zxc
|
8bd81ecfa3
|
isCancel
|
4 years ago |
zhaoqifeng
|
fcda9f67d2
|
活动相关脚本
|
4 years ago |
|
zhaoqifeng
|
dc916ece2a
|
活动相关脚本
|
4 years ago |
|
zhaoqifeng
|
99316be23e
|
活动相关脚本
|
4 years ago |
|
zxc
|
79695ea7e0
|
【网格员工作统计】例行工作列表
|
4 years ago |
wangxianzhang
|
2e39ea6069
|
Merge branches 'dev' and 'dev_routine_work' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_routine_work
|
4 years ago |
|
jianjun
|
527008eb49
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_ljj
|
4 years ago |
|
zxc
|
cba5cfdb1a
|
dto新增字段
|
4 years ago |
|
zxc
|
4e5ca3f670
|
倒叙
|
4 years ago |
|
zxc
|
c07eeb02ae
|
预约列表
|
4 years ago |
|
zxc
|
b068d038ff
|
预约列表
|
4 years ago |
|
zxc
|
0d580d5625
|
预约列表
|
4 years ago |
|
jianjun
|
40abd4791d
|
Revert "临时处理 202212为202112 因为他们传参错误 2"
This reverts commit e6b830b5
|
4 years ago |
|
zxc
|
29eb40106f
|
预约列表
|
4 years ago |
|
zxc
|
31b64a3551
|
预约列表
|
4 years ago |
|
zxc
|
93340345fd
|
预约列表
|
4 years ago |
|
zhaoqifeng
|
a69761f594
|
网格员相关统计修改
|
4 years ago |
|
jianjun
|
03133aab41
|
临时处理 202212为202112 因为他们传参错误 2
|
4 years ago |
|
jianjun
|
e6b830b568
|
临时处理 202212为202112 因为他们传参错误 2
|
4 years ago |
|
jianjun
|
605c42b614
|
Revert "临时处理 202212为202112 因为他们传参错误"
This reverts commit 32c92563
|
4 years ago |
|
jianjun
|
32c92563b4
|
临时处理 202212为202112 因为他们传参错误
|
4 years ago |
|
jianjun
|
1b04715bd1
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
1d67fa09df
|
看不出来 只能日志了
|
4 years ago |
|
jianjun
|
9823f4948e
|
例行工作次数统计 暂时先按照创建时间 全量添加
|
4 years ago |
|
wangxianzhang
|
fe733f99f9
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
|
wangxianzhang
|
a2ef3a9668
|
修改：
1.查询志愿者列表agencyId问题
|
4 years ago |
|
zxc
|
d07d2264b9
|
Merge remote-tracking branch 'origin/dev_2021_12_30_bug' into dev
|
4 years ago |
|
zxc
|
b83d07bfb3
|
bug之英文:
|
4 years ago |
|
zxc
|
52a2685bad
|
bug之:
|
4 years ago |
sunyuchao
|
ad84e17284
|
bug修改
|
4 years ago |
|
zxc
|
a9104ed36d
|
bug
|
4 years ago |
|
jianjun
|
e8396c2f5d
|
网格类型字典
|
4 years ago |
|
zxc
|
8feac6d00c
|
bug
|
4 years ago |
|
sunyuchao
|
3987c54b03
|
网格类型字典表数据
|
4 years ago |
|
zhaoqifeng
|
6fb98e11d0
|
社区党建相关bug修改
|
4 years ago |
|
zhaoqifeng
|
fb3d6de8e8
|
社区党建相关bug修改
|
4 years ago |
|
sunyuchao
|
248e615fbc
|
代码优化
|
4 years ago |
|
zxc
|
29047a1caa
|
bug
|
4 years ago |
|
zxc
|
53655b0896
|
Merge remote-tracking branch 'origin/dev_2021_12_30_bug' into dev
|
4 years ago |
|
zxc
|
fbfb4709bf
|
bug
|
4 years ago |
|
zxc
|
824167180d
|
emm
|
4 years ago |
|
jianjun
|
2223cef9b9
|
Merge remote-tracking branch 'remotes/origin/dev_2021_12_30_bug' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
|
4 years ago |
|
wangxianzhang
|
876614fc2c
|
合并dev代码，并且解决冲突
|
4 years ago |
|
zxc
|
b266e8532a
|
项目分布分析
|
4 years ago |
|
wangxianzhang
|
8a8c3cd218
|
Merge branches 'dev' and 'dev_ic_mp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_mp
Conflicts:
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java
epmet-module/epmet-job/epmet-job-server/pom.xml
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java
|
4 years ago |
yinzuomei
|
70db8dec17
|
没毛病，就是返回null,可能是当时约定好的吧
|
4 years ago |
|
wangxianzhang
|
05b8d96bec
|
Merge branches 'dev' and 'wxz_dim_sync' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_dim_sync
|
4 years ago |
|
zxc
|
402c06b261
|
字段名添加【小程序预约列表】
|
4 years ago |
