WendyYang
|
93bab940f9
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java
|
1 anno fa |
WendyYang
|
381ca8c346
|
Merge remote-tracking branch 'origin/expert_invite' into dev
# Conflicts:
# pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java
|
1 anno fa |
WendyYang
|
b1520c2d99
|
修改专家抽取专家层级支持多选
|
1 anno fa |
PoffyZhang
|
99a4b87bef
|
Merge branch '20230731_ls2_operation+early_warning+safety_risk+portrait' of http://git.ningdatech.com/liushuai/project-management into dev
|
1 anno fa |
PoffyZhang
|
0551d7c907
|
预警记录 按区域code
|
1 anno fa |
WendyYang
|
1594a90f6d
|
Merge remote-tracking branch 'origin/master'
|
1 anno fa |
WendyYang
|
c043181fc8
|
增加分页数据
|
1 anno fa |
PoffyZhang
|
57cb74faf7
|
Merge branch 'master' of http://git.ningdatech.com/liushuai/project-management into dev
|
1 anno fa |
PoffyZhang
|
2019fa318d
|
debug 历史版本
|
1 anno fa |
PoffyZhang
|
9d2e9863a7
|
Merge branch 'master' of http://git.ningdatech.com/liushuai/project-management into dev
|
1 anno fa |
PoffyZhang
|
7ec5cc0b30
|
Merge remote-tracking branch 'origin/master'
|
1 anno fa |
PoffyZhang
|
82fc8d6dba
|
debug 历史版本
|
1 anno fa |
WendyYang
|
f7d2dd1ef3
|
Merge remote-tracking branch 'origin/master'
|
1 anno fa |
WendyYang
|
ac07d9f501
|
增加数字资源指标获取接口
|
1 anno fa |
PoffyZhang
|
a552613bc8
|
Merge branch '20230731_ls2_operation+early_warning+safety_risk+portrait' of http://git.ningdatech.com/liushuai/project-management into dev
|
1 anno fa |
PoffyZhang
|
005bf0a700
|
预警记录 降序
|
1 anno fa |
PoffyZhang
|
0a986cf6f6
|
Merge branch 'master' of http://git.ningdatech.com/liushuai/project-management into dev
|
1 anno fa |
PoffyZhang
|
bac19ceaa4
|
优化 实例版本 流程实例
|
1 anno fa |
PoffyZhang
|
10f1e6fa35
|
预警记录
|
1 anno fa |
PoffyZhang
|
b4a0a4969e
|
Merge branch '20230731_ls2_operation+early_warning+safety_risk+portrait' of http://git.ningdatech.com/liushuai/project-management into dev
|
1 anno fa |
PoffyZhang
|
c80c7a3e7c
|
预警记录
|
1 anno fa |
PoffyZhang
|
ac5e10d26b
|
优化 预警监听
|
1 anno fa |
PoffyZhang
|
791f3cb46f
|
Merge branch '20230731_ls2_operation+early_warning+safety_risk+portrait' of http://git.ningdatech.com/liushuai/project-management into dev
|
1 anno fa |
PoffyZhang
|
4a18a6f39e
|
标签 批量删除 添加
|
1 anno fa |
PoffyZhang
|
fb642499c7
|
Merge branch 'ls2_operation+early_warning+safety_risk+portrait_0731' of http://git.ningdatech.com/liushuai/project-management into dev
|
1 anno fa |
PoffyZhang
|
5eac5db6a0
|
Merge branch 'master' of http://git.ningdatech.com/liushuai/project-management into dev
|
1 anno fa |
PoffyZhang
|
a1be9aaa89
|
优化流程实例 不要EMPTY
|
1 anno fa |
PoffyZhang
|
bbb399e981
|
预警记录
|
1 anno fa |
PoffyZhang
|
05a9fcfd3e
|
Merge branch 'master' of http://git.ningdatech.com/liushuai/project-management into dev
|
1 anno fa |
PoffyZhang
|
81a1093ee4
|
历史版本 只看 当前版本和退回 驳回的
|
1 anno fa |
PoffyZhang
|
a68ce4cf0a
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 anno fa |
PoffyZhang
|
2495b63a12
|
Merge branch 'master' of http://git.ningdatech.com/liushuai/project-management into dev
Conflicts:
pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java
|
1 anno fa |
PoffyZhang
|
41ec80453c
|
Merge remote-tracking branch 'origin/master'
|
1 anno fa |
PoffyZhang
|
f1079d561d
|
历史版本 只看 当前版本和退回 驳回的
|
1 anno fa |
CMM
|
5aa59c2320
|
Merge branch 'ls2_performance_appraisal_0801' of http://git.ningdatech.com/liushuai/project-management into dev
|
1 anno fa |
CMM
|
e1d8a1248c
|
评价计划-单位自评修改
|
1 anno fa |
WendyYang
|
9e0ac92fe1
|
修改履职评价接口
(cherry picked from commit a1d8bf52c7 )
|
1 anno fa |
WendyYang
|
653a33f41f
|
Merge remote-tracking branch 'origin/master'
|
1 anno fa |
WendyYang
|
a1d8bf52c7
|
修改履职评价接口
|
1 anno fa |
PoffyZhang
|
9ef160f9f7
|
Merge branch 'master' of http://git.ningdatech.com/liushuai/project-management into dev
|
1 anno fa |
PoffyZhang
|
6a7d416e19
|
优化间隔时间
|
1 anno fa |
PoffyZhang
|
f6a93d24c3
|
优化代码 删除标签
|
1 anno fa |
PoffyZhang
|
57d3edcd83
|
Merge branch 'ls2_operation+early_warning+safety_risk+portrait_0731' of http://git.ningdatech.com/liushuai/project-management into dev
Conflicts:
pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java
|
1 anno fa |
PoffyZhang
|
128b08ecbf
|
删除标签
|
1 anno fa |
PoffyZhang
|
2e578a49ac
|
Merge branch 'master' of http://git.ningdatech.com/liushuai/project-management into dev
|
1 anno fa |
PoffyZhang
|
8e7d07c15a
|
项目列表 增加项目编号和地区
|
1 anno fa |
CMM
|
9e33dc74ad
|
Merge branch 'ls2_performance_appraisal_0801' of http://git.ningdatech.com/liushuai/project-management into dev
|
1 anno fa |
CMM
|
0415b2f4f4
|
评价计划分组-分组项目、复评、核查人员重复校验
|
1 anno fa |
PoffyZhang
|
08066922f0
|
debug 重复map问题
|
1 anno fa |
PoffyZhang
|
d755d5c811
|
debug 重复map问题
|
1 anno fa |