 PoffyZhang
|
98d5e927c6
|
Merge branch 'master' of http://git.ningdatech.com/liushuai/project-management into dev
|
pirms 1 gada |
|
PoffyZhang
|
890086f6fe
|
优化生成code
|
pirms 1 gada |
|
PoffyZhang
|
f86dc7116c
|
Merge branch 'master' of http://git.ningdatech.com/liushuai/project-management into dev
|
pirms 1 gada |
|
PoffyZhang
|
1ecd782dae
|
成交金额 成家时间
|
pirms 1 gada |
|
PoffyZhang
|
09845bc16c
|
Merge branch 'master' of http://git.ningdatech.com/liushuai/project-management into dev
|
pirms 1 gada |
|
PoffyZhang
|
90256f6eaf
|
项目编号
|
pirms 1 gada |
|
PoffyZhang
|
9a93916db3
|
Merge remote-tracking branch 'origin/dev' into dev
|
pirms 1 gada |
|
PoffyZhang
|
d5a6675d36
|
Merge branch 'master' of http://git.ningdatech.com/liushuai/project-management into dev
|
pirms 1 gada |
|
PoffyZhang
|
af5e36d82e
|
续建不同意 意见返回
|
pirms 1 gada |
 CMM
|
7dbab5d65b
|
Merge branch 'ls2_performance_appraisal_0801' of http://git.ningdatech.com/liushuai/project-management into dev
|
pirms 1 gada |
|
CMM
|
5ac90b61d8
|
Merge remote-tracking branch 'origin/dev' into dev
|
pirms 1 gada |
|
CMM
|
66885f1aa7
|
Merge branch 'master' of http://git.ningdatech.com/liushuai/project-management into dev
|
pirms 1 gada |
|
CMM
|
971c6fca4c
|
绩效评价-模板匹配修改
|
pirms 1 gada |
|
PoffyZhang
|
324478f7f8
|
Merge remote-tracking branch 'origin/dev' into dev
|
pirms 1 gada |
|
PoffyZhang
|
0dabb74f29
|
项目不急着 id 置为空
|
pirms 1 gada |
|
CMM
|
c69f083d23
|
Merge branch 'ls2_performance_appraisal_0801' of http://git.ningdatech.com/liushuai/project-management into dev
Conflicts:
pmapi/src/main/java/com/ningdatech/pmapi/performance/model/vo/ProjectIndexTemplateVO.java
|
pirms 1 gada |
|
CMM
|
0b348b4d76
|
绩效评价-新增模板修改
|
pirms 1 gada |
|
PoffyZhang
|
514468f1b8
|
续建项目 debug
|
pirms 1 gada |
|
PoffyZhang
|
bf88771baf
|
优化 进度条的 立项批复
|
pirms 1 gada |
|
CMM
|
c0c928093d
|
Merge branch 'ls2_performance_appraisal_0801' of http://git.ningdatech.com/liushuai/project-management into dev
Conflicts:
pmapi/src/main/java/com/ningdatech/pmapi/performance/model/entity/PerformanceIndicatorProjectTemplate.java
|
pirms 1 gada |
|
CMM
|
a0827752d9
|
Merge branch '20230731_ls2_operation+early_warning+safety_risk+portrait' of http://git.ningdatech.com/liushuai/project-management into ls2_performance_appraisal_0801
|
pirms 1 gada |
|
CMM
|
f2d26e66bb
|
绩效评价-单位自评
|
pirms 1 gada |
|
CMM
|
38126fedff
|
绩效评价-单位自评
|
pirms 1 gada |
|
PoffyZhang
|
62dfda8dbe
|
Merge branch '20230731_ls2_operation+early_warning+safety_risk+portrait' of http://git.ningdatech.com/liushuai/project-management into dev
|
pirms 1 gada |
|
PoffyZhang
|
a1353bf9df
|
优化 区管角色
|
pirms 1 gada |
|
CMM
|
92b4a960e7
|
Merge branch '20230731_ls2_operation+early_warning+safety_risk+portrait' of http://git.ningdatech.com/liushuai/project-management into ls2_performance_appraisal_0801
|
pirms 1 gada |
|
PoffyZhang
|
4eac67380e
|
Merge branch '20230731_ls2_operation+early_warning+safety_risk+portrait' of http://git.ningdatech.com/liushuai/project-management into dev
|
pirms 1 gada |
|
PoffyZhang
|
849b210de7
|
历史版本 优化
|
pirms 1 gada |
|
PoffyZhang
|
ba2780012b
|
Merge branch '20230731_ls2_operation+early_warning+safety_risk+portrait' of http://git.ningdatech.com/liushuai/project-management into dev
|
pirms 1 gada |
|
PoffyZhang
|
df0d1a6af0
|
历史版本 优化
|
pirms 1 gada |
|
PoffyZhang
|
74814e200d
|
Merge branch '20230731_ls2_operation+early_warning+safety_risk+portrait' of http://git.ningdatech.com/liushuai/project-management into dev
|
pirms 1 gada |
|
PoffyZhang
|
5fca9e17b4
|
历史版本 优化
|
pirms 1 gada |
|
PoffyZhang
|
5e293a65d4
|
Merge branch '20230731_ls2_operation+early_warning+safety_risk+portrait' of http://git.ningdatech.com/liushuai/project-management into dev
|
pirms 1 gada |
|
PoffyZhang
|
da5d0f15ec
|
应用核心业务 id
|
pirms 1 gada |
|
PoffyZhang
|
07a7e755dc
|
Merge branch '20230731_ls2_operation+early_warning+safety_risk+portrait' of http://git.ningdatech.com/liushuai/project-management into dev
|
pirms 1 gada |
|
PoffyZhang
|
4bfca46ddf
|
预警 任务 改成小时
|
pirms 1 gada |
|
PoffyZhang
|
e8d7273cb2
|
Merge branch '20230731_ls2_operation+early_warning+safety_risk+portrait' of http://git.ningdatech.com/liushuai/project-management into dev
|
pirms 1 gada |
|
PoffyZhang
|
cd9e6d09a3
|
立项批复 优化
|
pirms 1 gada |
|
PoffyZhang
|
d7046792a4
|
Merge branch '20230731_ls2_operation+early_warning+safety_risk+portrait' of http://git.ningdatech.com/liushuai/project-management into dev
|
pirms 1 gada |
|
PoffyZhang
|
28e20fde1a
|
立项批复 优化
|
pirms 1 gada |
|
PoffyZhang
|
89302d8926
|
Merge branch '20230731_ls2_operation+early_warning+safety_risk+portrait' of http://git.ningdatech.com/liushuai/project-management into dev
|
pirms 1 gada |
|
PoffyZhang
|
ae5b3dcf1c
|
立项批复 优化
|
pirms 1 gada |
|
PoffyZhang
|
a94cf0a403
|
Merge branch '20230731_ls2_operation+early_warning+safety_risk+portrait' of http://git.ningdatech.com/liushuai/project-management into dev
|
pirms 1 gada |
|
PoffyZhang
|
19e93deb0f
|
应用是否是 建设方案的
|
pirms 1 gada |
|
PoffyZhang
|
7d0ab6a3ca
|
Merge branch 'master' of http://git.ningdatech.com/liushuai/project-management into dev
|
pirms 1 gada |
|
PoffyZhang
|
a92a51cd59
|
应用是否是 建设方案的
|
pirms 1 gada |
|
PoffyZhang
|
03a9647a40
|
Merge branch '20230731_ls2_operation+early_warning+safety_risk+portrait' of http://git.ningdatech.com/liushuai/project-management into dev
|
pirms 1 gada |
|
PoffyZhang
|
a070de47dc
|
延期 优化
|
pirms 1 gada |
|
PoffyZhang
|
8d3f17bf3f
|
Merge branch '20230731_ls2_operation+early_warning+safety_risk+portrait' of http://git.ningdatech.com/liushuai/project-management into dev
|
pirms 1 gada |
|
PoffyZhang
|
7dc5d3a2ee
|
延期 优化
|
pirms 1 gada |
