jianjun
|
8372426804
|
改改环境
|
4 years ago |
zxc
|
d0adeac4ad
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
534e44f446
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
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 |
|
sunyuchao
|
df7fea60dc
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
sunyuchao
|
baf25684a6
|
Merge branch 'dev_bugfix_ljj' into develop
|
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
|
46392f1790
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
37b526e794
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
# 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
|
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
|
48ac363b9f
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
zhaoqifeng
|
bdfc75d490
|
Merge branch 'dev_bugfix_ljj' into develop
|
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 |
|
jianjun
|
d0a4c5fd46
|
Merge remote-tracking branch 'remotes/origin/develop' into release_temp
|
4 years ago |
wangxianzhang
|
32b1be10dc
|
谁误删了.gitignore，这里找回来了
|
4 years ago |
|
jianjun
|
f2b2cf6a2a
|
Merge remote-tracking branch 'remotes/origin/dev_shibei_project_catagory' into develop
|
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 |
|
zhaoqifeng
|
77fbcbe45b
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
zhaoqifeng
|
e66c820aa7
|
Merge branch 'dev_bugfix_ljj' into develop
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
|
4 years ago |
|
sunyuchao
|
36a3caeb2d
|
Merge remote-tracking branch 'origin/dev_shibei_match' into dev_shibei_match
|
4 years ago |
|
sunyuchao
|
5085ee807d
|
Merge branch 'dev_bugfix_ljj' into dev_shibei_match
|
4 years ago |
|
zhaoqifeng
|
2e85c54acf
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
zhaoqifeng
|
6396bd646b
|
备注
|
4 years ago |
|
sunyuchao
|
763edcd766
|
项目机关日统计程序优化
|
4 years ago |
yinzuomei
|
9e3c4944d1
|
Merge remote-tracking branch 'origin/master' into shibei_master
|
4 years ago |
|
zhaoqifeng
|
9dd6f1d4fe
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
zhaoqifeng
|
2515f1f618
|
Merge branch 'dev_bugfix_ljj' into develop
|
4 years ago |
|
zhaoqifeng
|
0fad17e961
|
计算两个日期之间的时间差(只包括工作日) 修改
|
4 years ago |
