 hufangzhou
|
d99acc8cf8
|
* Remove the unused code.
|
2022-05-12 13:37:11 +08:00 |
|
|
hufangzhou
|
80124c681e
|
* Fix bug #22364.
|
2022-05-12 13:29:39 +08:00 |
|
|
wangyidong
|
c0f53c6740
|
Merge branch 'sprint/189_zhouxudong_53651'
|
2022-05-12 13:20:50 +08:00 |
|
|
王怡栋
|
a9d13faa1a
|
Merge branch 'master' into 'sprint/189_zhouxudong_53651'
# Conflicts:
# module/execution/js/edit.js
|
2022-05-12 05:20:13 +00:00 |
|
|
zhouxudong
|
4bd2710b91
|
* Finish task #53651.
|
2022-05-12 05:15:13 +00:00 |
|
|
王怡栋
|
5674160b7e
|
Merge branch 'master_xieqiyu_53666' into 'master'
Master xieqiyu 53666
See merge request easycorp/zentaopms!3353
|
2022-05-12 05:05:25 +00:00 |
|
|
zhouxudong
|
13e965e484
|
* Finish task #53651.
|
2022-05-12 05:02:51 +00:00 |
|
|
孙广明
|
ede17889fd
|
Merge branch 'sprint/189_mayue_task#53652'
|
2022-05-12 13:02:03 +08:00 |
|
|
孙广明
|
a770924dcf
|
Merge branch 'master' into 'sprint/189_mayue_task#53652'
# Conflicts:
# module/project/model.php
|
2022-05-12 05:01:42 +00:00 |
|
|
zhouxudong
|
f98d82234a
|
* Finish task #53651.
|
2022-05-12 03:57:23 +00:00 |
|
|
mayue
|
e65e7568b2
|
* Optimize code.
|
2022-05-12 03:37:22 +00:00 |
|
|
mayue
|
5a2ef22f3b
|
* Optimize code.
|
2022-05-12 03:17:00 +00:00 |
|
|
mayue
|
3a2c854159
|
* Optimize code.
|
2022-05-12 03:13:39 +00:00 |
|
|
mayue
|
ac6e3ab491
|
* Optimize code.
|
2022-05-12 02:58:23 +00:00 |
|
|
mayue
|
4460a50980
|
* Optimize code.
|
2022-05-12 02:50:13 +00:00 |
|
|
李玉春
|
b557af3aee
|
Merge branch 'sprint/189_liumengyi_unittest' into 'master'
* add unit test of sprint 189.
See merge request easycorp/zentaopms!3350
|
2022-05-12 02:47:51 +00:00 |
|
|
孙广明
|
1ea33ead7d
|
Merge branch 'sprint/189_zhouxin_22371' into 'master'
* Fix bug #22371.
See merge request easycorp/zentaopms!3351
|
2022-05-12 02:46:15 +00:00 |
|
|
zhouxin
|
3e2181dea0
|
* Fix bug #22371.
|
2022-05-12 02:44:37 +00:00 |
|
|
liumengyi
|
f3f439cb47
|
* Add annotation.
|
2022-05-12 10:44:16 +08:00 |
|
|
liumengyi
|
d254880466
|
* add unit test of sprint 189.
|
2022-05-12 10:40:41 +08:00 |
|
|
mayue
|
46c555fb3f
|
* Add max code.
|
2022-05-12 02:38:33 +00:00 |
|
|
孙广明
|
accd470af0
|
Merge branch 'sprint/189_zhouxin_22361' into 'master'
* Fix bug #22361.
See merge request easycorp/zentaopms!3348
|
2022-05-12 01:38:54 +00:00 |
|
|
zhouxin
|
86344c7a65
|
* Fix bug #22361.
|
2022-05-12 01:35:53 +00:00 |
|
|
王怡栋
|
d11a0831f8
|
Merge branch 'fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!3345
|
2022-05-12 01:07:16 +00:00 |
|
|
孙广明
|
d8b904fd1f
|
Merge branch 'fix_bug' into 'master'
Fix bug
See merge request easycorp/zentaopms!3347
|
2022-05-12 00:38:39 +00:00 |
|
|
孙华伟
|
1251eda902
|
*Fix bug.
|
2022-05-12 08:35:59 +08:00 |
|
|
zhouxudong
|
65fff67e58
|
* finish task #53651.
|
2022-05-12 00:30:00 +00:00 |
|
|
孙华伟
|
0f16d90905
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-05-12 08:18:14 +08:00 |
|
|
xieqiyu
|
e7d559a90b
|
* Fix bug for task#53666.
|
2022-05-12 01:13:42 +08:00 |
|
|
xieqiyu
|
612a2b656e
|
* Adjust code style.
|
2022-05-12 00:18:05 +08:00 |
|
|
xieqiyu
|
dab8c1bb1e
|
* Modify review code.
|
2022-05-12 10:55:50 +08:00 |
|
|
xieqiyu
|
ffa1ec828d
|
* Code for task#53661.
|
2022-05-12 10:38:22 +08:00 |
|
|
xieqiyu
|
1cab87893e
|
* Finish task#53661.
|
2022-05-12 09:19:49 +08:00 |
|
|
xieqiyu
|
691de86d4a
|
* Code for task#53661.
|
2022-05-12 08:15:25 +08:00 |
|
|
xieqiyu
|
ce7c0afdc1
|
* Finish task#53666.
|
2022-05-11 18:24:13 +08:00 |
|
|
孙广明
|
400399d97f
|
Merge branch 'sunhuawei-master-patch-74221' into 'master'
Sunhuawei master patch 74221
See merge request easycorp/zentaopms!3346
|
2022-05-11 09:37:58 +00:00 |
|
|
孙广明
|
621e257ae1
|
Merge branch 'sprint189_zg_53653' into 'master'
Finish task#53653，53657
See merge request easycorp/zentaopms!3313
|
2022-05-11 09:37:07 +00:00 |
|
|
孙华伟
|
2eddac20a1
|
Update update16.5.sql
|
2022-05-11 09:36:56 +00:00 |
|
|
孙华伟
|
1f72825b20
|
Update update16.5.sql
|
2022-05-11 09:36:27 +00:00 |
|
|
孙华伟
|
a798dd5f9c
|
*Fix upgrade bug.
|
2022-05-11 17:33:50 +08:00 |
|
|
zenggang
|
a2b64debb9
|
* Adjust code
|
2022-05-11 09:24:30 +00:00 |
|
|
tanghucheng
|
214259dfc0
|
* Fix bug.
|
2022-05-11 09:23:03 +00:00 |
|
|
孙广明
|
5b67fec07c
|
Merge branch 'sprint/189_zhouxin_53656' into 'master'
* Fix bug #53656.
See merge request easycorp/zentaopms!3344
|
2022-05-11 09:17:06 +00:00 |
|
|
王怡栋
|
bc71574f01
|
Merge branch 'sprint/wangyuting_workflow' into 'master'
* Adjust release action menu.
See merge request easycorp/zentaopms!3341
|
2022-05-11 09:14:54 +00:00 |
|
|
孙广明
|
8e53847096
|
Merge branch 'sunhuawei_task_53659' into 'master'
*Fix bug.
See merge request easycorp/zentaopms!3342
|
2022-05-11 09:11:46 +00:00 |
|
|
zenggang
|
0fe5a1884f
|
* Adjust code
|
2022-05-11 09:11:13 +00:00 |
|
|
王怡栋
|
fe9eb1bf83
|
Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
Sprint/master zhouxudong fixbug
See merge request easycorp/zentaopms!3340
|
2022-05-11 09:09:04 +00:00 |
|
|
王怡栋
|
b8533b242c
|
Merge branch 'sprint/master_zhouxudong_22337' into 'master'
* Fix bug #22337.
See merge request easycorp/zentaopms!3329
|
2022-05-11 09:08:33 +00:00 |
|
|
zenggang
|
2bc6e6b468
|
* Adjust code
|
2022-05-11 09:08:18 +00:00 |
|
|
李玉春
|
5a8b0f22b3
|
Merge branch 'sprint/189_liumengyi' into 'master'
* Fix bug for close product.
See merge request easycorp/zentaopms!3343
|
2022-05-11 09:08:08 +00:00 |
|