 xieqiyu
|
54a12ea735
|
* Fix bug of task#79663.
|
2022-12-13 16:44:33 +08:00 |
|
|
xieqiyu
|
5c2ed30fd3
|
* Fix bug of task#79663.
|
2022-12-13 16:42:17 +08:00 |
|
|
王怡栋
|
e70366d1c7
|
Merge branch 'zentaopms273_wyd' into 'master'
* code task #79859,79858,79857,79856,79855,79854.
See merge request easycorp/zentaopms!6531
|
2022-12-13 06:17:58 +00:00 |
|
|
wangyidong
|
8dc609e4a0
|
* code task #79859,79858,79857,79856,79855,79854.
|
2022-12-13 14:15:39 +08:00 |
|
|
孙广明
|
389a68e863
|
Merge branch 'master_xieqiyu_79663' into 'master'
* Code for task#79663.
See merge request easycorp/zentaopms!6526
|
2022-12-13 01:33:28 +00:00 |
|
|
wangyidong
|
5bf3b27262
|
* code for task #79861,79860.
|
2022-12-13 08:38:36 +08:00 |
|
|
xieqiyu
|
a46ddf8ee7
|
* Code for task#79663.
|
2022-12-12 16:40:23 +08:00 |
|
|
Yagami
|
27b73d7dcd
|
* Code for function review.
|
2022-12-12 16:16:51 +08:00 |
|
|
孙广明
|
8fa7675188
|
Merge branch 'master' into 'master_xieqiyu_78690'
# Conflicts:
# module/productplan/model.php
|
2022-12-09 08:58:14 +00:00 |
|
|
xieqiyu
|
7405efe5c7
|
* Code for task#78690.
|
2022-12-09 15:39:55 +08:00 |
|
|
孙广明
|
1f1e87e9cc
|
Merge branch 'master_xieqiyu_30698' into 'master'
* Fix bug#30698.
See merge request easycorp/zentaopms!6509
|
2022-12-09 06:49:32 +00:00 |
|
|
lanzongjun
|
8a0cbc6e6d
|
* Finish Bug #30637
|
2022-12-09 09:41:06 +08:00 |
|
|
xieqiyu
|
4724af01bb
|
* Fix bug#30698.
|
2022-12-08 16:11:20 +08:00 |
|
|
孙广明
|
31ef3e0260
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Finish Bug #30480
See merge request easycorp/zentaopms!6498
|
2022-12-08 06:05:50 +00:00 |
|
|
xieqiyu
|
c4c0fe7271
|
* Fix bug#30550,#30607.
|
2022-12-08 12:18:55 +08:00 |
|
|
lanzongjun
|
d6f9976aae
|
* Finish Bug #30480
|
2022-12-08 11:06:04 +08:00 |
|
|
孙广明
|
99f18346bb
|
Merge branch 'master_xieqiyu_78690' into 'master'
* Finish task#78690.
See merge request easycorp/zentaopms!6495
|
2022-12-08 02:50:29 +00:00 |
|
|
孙广明
|
5a7fdb8ec5
|
Merge branch 'master_xieqiyu_78699' into 'master'
* Finish task#78699.
See merge request easycorp/zentaopms!6496
|
2022-12-08 02:50:18 +00:00 |
|
|
xieqiyu
|
847bb6be13
|
* Finish task#78698.
|
2022-12-08 10:46:58 +08:00 |
|
|
xieqiyu
|
8472e0a191
|
* Finish task#78699.
|
2022-12-08 10:34:46 +08:00 |
|
|
xieqiyu
|
80af5ddba5
|
* Finish task#78690.
|
2022-12-08 10:06:46 +08:00 |
|
|
孙广明
|
cbb280ba3f
|
Merge branch 'master_xieqiyu_fixbug' into 'master'
* Code for task#78669. Fix bug of edit parent plan.
See merge request easycorp/zentaopms!6480
|
2022-12-07 01:36:23 +00:00 |
|
|
lanzongjun
|
a228bfdeeb
|
resolve conflict
|
2022-12-06 17:21:18 +08:00 |
|
|
lanzongjun
|
55aac8c426
|
* Finish Task #78664
|
2022-12-06 16:51:58 +08:00 |
|
|
xieqiyu
|
a4ae40d43b
|
* Code for task#78669. Fix bug of edit parent plan.
|
2022-12-06 16:22:36 +08:00 |
|
|
孙广明
|
262e4972b3
|
Merge branch 'master_xieqiyu_78669' into 'master'
Master xieqiyu 78669
See merge request easycorp/zentaopms!6478
|
2022-12-06 08:08:45 +00:00 |
|
|
xieqiyu
|
6f8dd9e186
|
* Code for task#78669. Add branch name in tips.
|
2022-12-06 14:27:17 +08:00 |
|
|
xieqiyu
|
62157bf79e
|
* Code for task#78669.
|
2022-12-06 10:24:11 +08:00 |
|
|
lanzongjun
|
0adbd8e27a
|
* Finish Bug #30541
|
2022-12-06 10:16:34 +08:00 |
|
|
xieqiyu
|
c23d02ca73
|
* Code for task#78669.
|
2022-12-06 10:03:42 +08:00 |
|
|
xieqiyu
|
c1257aac6b
|
* Code for task#78669.
|
2022-12-06 09:57:03 +08:00 |
|
|
孙广明
|
6a29023b24
|
* Finish task #78675.
|
2022-12-06 09:39:47 +08:00 |
|
|
xieqiyu
|
0c42a46b93
|
* Code for task#78669.
|
2022-12-06 09:16:54 +08:00 |
|
|
lanzongjun
|
a0c214eace
|
* fix bug #30475
|
2022-12-02 15:54:05 +08:00 |
|
|
lanzongjun
|
3b09109e21
|
* fix bug #30496
|
2022-12-02 15:34:11 +08:00 |
|
|
孙广明
|
0019435f65
|
Merge branch 'sprint/zentaopms268_mayue_bug#30457' into 'zentaopms_256'
* Fix bug #30457.
See merge request easycorp/zentaopms!6450
|
2022-12-02 06:35:44 +00:00 |
|
|
lanzongjun
|
19db2248d9
|
* fix bug #30480
|
2022-12-02 13:57:34 +08:00 |
|
|
lanzongjun
|
aa96dfc3a9
|
* fix bug #30447
|
2022-12-02 13:28:08 +08:00 |
|
|
lanzongjun
|
0a5e89dd34
|
* fix bug #30482
|
2022-12-02 10:59:34 +08:00 |
|
|
lanzongjun
|
a835220fe1
|
resolve conflict master
|
2022-12-02 10:28:31 +08:00 |
|
|
mayue
|
7d92df405a
|
* Fix bug #30457.
|
2022-12-02 09:53:44 +08:00 |
|
|
mayue
|
c866a1ab41
|
* Fix bug #30422.
|
2022-12-01 14:46:04 +08:00 |
|
|
兰宗俊
|
d4c0fd8501
|
Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256'
* fix bug #30405
See merge request easycorp/zentaopms!6429
|
2022-12-01 05:10:30 +00:00 |
|
|
lanzongjun
|
6548926a91
|
* fix bug #30405
|
2022-12-01 11:18:53 +08:00 |
|
|
lanzongjun
|
bffe373548
|
* fix bug #30405
|
2022-12-01 11:17:05 +08:00 |
|
|
xieqiyu
|
d5b322bc05
|
* Code for task#77802. Add tips when branch empty at batch edit plan.
|
2022-12-01 10:41:27 +08:00 |
|
|
wangyidong
|
283b37b65e
|
* adjust for task #77615,77616.
|
2022-12-01 10:26:12 +08:00 |
|
|
xieqiyu
|
c109140c81
|
* Code for task#77802. Modify batch edit plan.
|
2022-12-01 10:06:33 +08:00 |
|
|
孙广明
|
917e23dbcd
|
Merge branch 'sprint/zentaopms268_mayue_task#77795' into 'zentaopms_256'
* Unlink bug when edit branch of plan.
See merge request easycorp/zentaopms!6424
|
2022-12-01 01:08:20 +00:00 |
|
|
mayue
|
d16d7fcb08
|
* Unlink bug when edit branch of plan.
|
2022-12-01 09:06:16 +08:00 |
|