jianjun
|
2532922f9e
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
jianjun
|
7f837051c4
|
项目变动 up
|
4 years ago |
zhaoqifeng
|
a6ca2de18f
|
项目结案时只更新项目状态与耗时
|
4 years ago |
sunyuchao
|
129b501a6f
|
Merge branch 'dev_import' into develop
|
4 years ago |
zxc
|
b81267ad11
|
Async
|
4 years ago |
|
sunyuchao
|
c5334c1ab6
|
代码调整
|
4 years ago |
|
sunyuchao
|
57a269bf44
|
党员风采和社会自组织上传改为异步
|
4 years ago |
|
jianjun
|
9919509c6f
|
挪走了
|
4 years ago |
|
jianjun
|
321a7bcb43
|
日志级别调整
|
4 years ago |
wangxianzhang
|
372ea3864f
|
Merge branch 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
60a7b0d08e
|
增加 common-service importTask的flyway脚本
|
4 years ago |
|
wangxianzhang
|
9896ff818d
|
Merge branch 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
d4258aa9b5
|
增加 common-service importTask的flyway脚本
|
4 years ago |
|
jianjun
|
5d9828085c
|
配置pc客户菜单时 删除缓存
|
4 years ago |
|
jianjun
|
7589b5a6b2
|
导航菜单添加缓存
|
4 years ago |
|
zhaoqifeng
|
260d9bf2af
|
Merge branch 'dev_shuzipingtai_202202_bug' into develop
# Conflicts:
# epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
|
4 years ago |
|
zhaoqifeng
|
17cb880d21
|
党建单位分类统计sql修改
|
4 years ago |
|
zhaoqifeng
|
cc782e9191
|
Merge branch 'dev_bugfix_ljj' into develop
|
4 years ago |
|
zhaoqifeng
|
c91dc63072
|
根据staffId查询用户基本信息接口返回客户名
|
4 years ago |
|
zhaoqifeng
|
b86a15de20
|
Merge branch 'dev_bugfix_ljj' into develop
|
4 years ago |
|
zhaoqifeng
|
1d58c4e52b
|
根据staffId查询用户基本信息接口返回客户名
|
4 years ago |
|
zxc
|
0804b61d83
|
user，org
|
4 years ago |
yinzuomei
|
4ceee13be0
|
例行工作bugfix1
|
4 years ago |
|
yinzuomei
|
d62486c801
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
45775fc7d1
|
例行工作bugfix
|
4 years ago |
|
zhaoqifeng
|
0f77c00dc8
|
Merge branch 'dev_import' into develop
|
4 years ago |
|
zhaoqifeng
|
e80c4e6733
|
联建活动关联多个单位和服务事项修改
|
4 years ago |
|
zhaoqifeng
|
6bc7c62445
|
联建活动关联多个单位和服务事项sql脚本
|
4 years ago |
|
zxc
|
5d8f3efca1
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
f9cfd79589
|
bug
|
4 years ago |
|
zhaoqifeng
|
de1e5ae229
|
Merge branch 'dev_import' into develop
|
4 years ago |
|
zhaoqifeng
|
22623aa25c
|
联建活动关联多个单位和服务事项
|
4 years ago |
|
wangxianzhang
|
cac5783faf
|
Merge remote-tracking branch 'origin/dev_import' into dev_import
|
4 years ago |
|
wangxianzhang
|
d59d188754
|
修改：
1.居民导入-改为异步-待测试
|
4 years ago |
|
zhaoqifeng
|
5410fbd949
|
Merge branch 'dev_import' into develop
|
4 years ago |
|
zhaoqifeng
|
4d3827e0b4
|
联建活动关联多个单位和服务事项
|
4 years ago |
|
jianjun
|
562c6badb2
|
按照开始时间排序
|
4 years ago |
|
zhaoqifeng
|
25191c8785
|
Merge branch 'dev_import' into develop
|
4 years ago |
|
zhaoqifeng
|
c727eb22ce
|
Merge remote-tracking branch 'origin/dev_import' into dev_import
|
4 years ago |
|
zhaoqifeng
|
135ace7c36
|
联建活动关联多个单位和服务事项
|
4 years ago |
|
jianjun
|
3c4c5da40c
|
Merge remote-tracking branch 'origin/dev_import' into dev_import
|
4 years ago |
|
jianjun
|
bac2851b48
|
添加返回结果
|
4 years ago |
|
zhaoqifeng
|
d6bef6ed45
|
Merge branch 'dev_import' into develop
|
4 years ago |
|
zhaoqifeng
|
ac62f98118
|
联建活动关联多个单位和服务事项
|
4 years ago |
|
jianjun
|
0772fc34ca
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
b3677b3ab0
|
巡查间隔20s
|
4 years ago |
|
zhaoqifeng
|
36f323307b
|
Merge branch 'dev_import' into develop
|
4 years ago |
|
sunyuchao
|
8f450f696a
|
Merge remote-tracking branch 'origin/dev_import' into dev_import
|
4 years ago |
|
sunyuchao
|
f4f9cdabbd
|
漏提文件
|
4 years ago |
|
zhaoqifeng
|
f041d66f7f
|
Merge branch 'dev_import' into develop
|
4 years ago |
