jianjun
|
ec47ae90c1
|
merege
|
4 years ago |
|
jianjun
|
c01c436129
|
Merge remote-tracking branch 'remotes/origin/dev_shibei_task' into shibei_master
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java
|
4 years ago |
|
jianjun
|
9db1ab0b60
|
数字社区单独部署 支持的定时任务 拆分2个任务
|
4 years ago |
|
jianjun
|
78f493cee9
|
数字社区单独部署 支持的定时任务 拆分2个任务
|
4 years ago |
|
jianjun
|
7ecdff5382
|
数字社区单独部署 支持的定时任务
|
4 years ago |
|
jianjun
|
d6224c4626
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
4913929f38
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into shibei_master
|
4 years ago |
|
jianjun
|
a48f50b6b7
|
动力网格 市北专属
|
4 years ago |
|
jianjun
|
2a2ce3d23f
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
46fbe3b38f
|
动力网格 市北专属
|
4 years ago |
zhaoqifeng
|
c191724ce8
|
项目管理-全部项目列表查询
|
4 years ago |
|
jianjun
|
da7583c96a
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into shibei_master
|
4 years ago |
|
jianjun
|
43d61dde0d
|
动力网格 市北专属
|
4 years ago |
sunyuchao
|
28948f574a
|
Merge branch 'dev_sb_category_syc' into shibei_master
|
4 years ago |
|
sunyuchao
|
db7197e39b
|
bug修改
|
4 years ago |
|
sunyuchao
|
08826a3f80
|
Merge branch 'dev_sb_category_syc' into shibei_master
|
4 years ago |
|
sunyuchao
|
898d90614b
|
again
|
4 years ago |
|
sunyuchao
|
fa8a17fddc
|
Merge branch 'dev_sb_category_syc' into shibei_master
|
4 years ago |
|
sunyuchao
|
4dc28386ab
|
市北分类项目数据查询逻辑变动
|
4 years ago |
zxc
|
564f8ef162
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
c21042acc8
|
yitibiaojue
|
4 years ago |
|
jianjun
|
8372426804
|
改改环境
|
4 years ago |
|
jianjun
|
a4fbfb2fd7
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into shibei_master
|
4 years ago |
|
zxc
|
41e2f9f899
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
3182879841
|
小组组织日统计还原
|
4 years ago |
|
zxc
|
d2c2e5cf03
|
议题表决日统计
|
4 years ago |
|
zxc
|
a3ce3f765c
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
d071898560
|
议题统计暂提
|
4 years ago |
|
sunyuchao
|
18b1873d7b
|
Merge branch 'dev_bugfix_ljj' into shibei_master
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml
|
4 years ago |
|
zxc
|
f4c9672e5b
|
小组机关日统计
|
4 years ago |
|
sunyuchao
|
3fae4181be
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
sunyuchao
|
494f75aa27
|
分页方法调用调整
|
4 years ago |
|
zxc
|
64620db2ec
|
议题表决日统计
|
4 years ago |
|
jianjun
|
7b0260362d
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
3fc9b0b077
|
去掉mock数据
|
4 years ago |
|
jianjun
|
6d1e55e7ca
|
Merge remote-tracking branch 'remotes/origin/dev_shibei_project_catagory' into dev
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml
|
4 years ago |
|
jianjun
|
c31f526c0b
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
sunyuchao
|
a023ee03eb
|
项目分类分析右侧列表所属网格调整为所属组织
|
4 years ago |
|
sunyuchao
|
fc41469e44
|
Merge branch 'dev_bugfix_ljj' into shibei_master
|
4 years ago |
|
sunyuchao
|
6b1b3a4449
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
sunyuchao
|
062a1e5f8d
|
again
|
4 years ago |
|
zhaoqifeng
|
1a34993e41
|
脚本
|
4 years ago |
|
jianjun
|
3e81854be8
|
Merge remote-tracking branch 'remotes/origin/dev_shibei_match' into shibei_master
|
4 years ago |
|
jianjun
|
430336d1fb
|
Merge branch 'dev_shibei_project_catagory' into dev_shibei_match
|
4 years ago |
wangxianzhang
|
32b1be10dc
|
谁误删了.gitignore，这里找回来了
|
4 years ago |
|
jianjun
|
772752b9be
|
数字社区平台 1级项目分类数量 从业务库直接查询
|
4 years ago |
|
sunyuchao
|
e89a7c0742
|
Merge branch 'dev_bugfix_ljj' into shibei_master
|
4 years ago |
|
jianjun
|
fb2dda4827
|
Merge remote-tracking branch 'origin/dev_shibei_match' into shibei_master
|
4 years ago |
|
sunyuchao
|
57cc230f46
|
Merge branch 'dev_bugfix_ljj' into dev_shibei_match
|
4 years ago |
|
sunyuchao
|
28268653a5
|
..
|
4 years ago |
