 xieqiyu
|
a46ddf8ee7
|
* Code for task#79663.
|
2022-12-12 16:40:23 +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 |
|
|
lanzongjun
|
8a0cbc6e6d
|
* Finish Bug #30637
|
2022-12-09 09:41:06 +08:00 |
|
|
lanzongjun
|
d6f9976aae
|
* Finish Bug #30480
|
2022-12-08 11:06:04 +08: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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
兰宗俊
|
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 |
|
|
孙广明
|
f44f500593
|
Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256'
Sprint/zentaopms256 lanzongjun
See merge request easycorp/zentaopms!6423
|
2022-12-01 00:44:23 +00:00 |
|
|
lanzongjun
|
65fe5985a2
|
code meeting fix
|
2022-12-01 08:29:35 +08:00 |
|
|
xieqiyu
|
7c51a7f992
|
* Code for task#77802.
|
2022-11-30 22:18:27 +08:00 |
|
|
lanzongjun
|
b1831623e5
|
* Finish Task #77806
|
2022-11-30 15:16:44 +08:00 |
|
|
lanzongjun
|
9eebd0051d
|
* Finish Task #77799
|
2022-11-30 13:44:25 +08:00 |
|
|
孙广明
|
529a0d3828
|
Merge branch 'pms256_xieqiyu_77794' into 'zentaopms_256'
Pms256 xieqiyu 77794
See merge request easycorp/zentaopms!6411
|
2022-11-30 02:46:30 +00:00 |
|
|
xieqiyu
|
2a92cee55e
|
* Code for task#77794. Batch edit productplan.
|
2022-11-30 09:45:37 +08:00 |
|
|
xieqiyu
|
5095e566d8
|
* Code for task#77794. Edit productplan.
|
2022-11-30 09:30:44 +08:00 |
|
|
lanzongjun
|
00877a531d
|
code meeting fix
|
2022-11-30 09:05:23 +08:00 |
|
|
lanzongjun
|
cab0ed4caf
|
project edit plan modify
|
2022-11-29 15:50:31 +08:00 |
|
|
xieqiyu
|
2c6e7ffa39
|
* Code for task#77794.
|
2022-11-29 15:03:58 +08:00 |
|
|
lanzongjun
|
9077e9b4a3
|
* Fix Task #77798
|
2022-11-29 14:35:07 +08:00 |
|
|
孙广明
|
c3b5086237
|
Merge branch 'sprint/zentaopms262_mayue_bug#29945' into 'master'
* Fix bug #29945.
See merge request easycorp/zentaopms!6305
|
2022-11-23 00:52:47 +00:00 |
|
|
mayue
|
de42397894
|
* Fix bug #29945.
|
2022-11-23 08:41:11 +08:00 |
|
|
王怡栋
|
72106fa341
|
Merge branch 'master_feedback_1468' into 'master'
* Adjust code for feedback #1468.
See merge request easycorp/zentaopms!6300
|
2022-11-22 08:02:34 +00:00 |
|
|
liuhong
|
d44f253a49
|
* Adjust code for feedback #1468.
|
2022-11-22 06:50:35 +00:00 |
|
|
王怡栋
|
68e6f5695f
|
Merge branch 'master_feedback_1468' into 'master'
* Adjust code for feedback #1468.
See merge request easycorp/zentaopms!6261
|
2022-11-21 00:53:18 +00:00 |
|
|
liuhong
|
efb20b02d8
|
* Adjust code for feedback #1468.
|
2022-11-21 00:01:24 +00:00 |
|
|
王怡栋
|
7961c8bc55
|
Merge branch 'master_feedback_1468' into 'master'
Master feedback 1468
See merge request easycorp/zentaopms!6251
|
2022-11-18 07:22:01 +00:00 |
|
|
liuhong
|
ef32ff16ec
|
* Adjust code for feedback #1468
|
2022-11-18 03:51:12 +00:00 |
|
|
mayue
|
8d97e96399
|
* Fix bug #29944.
|
2022-11-18 10:31:15 +08:00 |
|
|
liuhong
|
51f8bf37d6
|
* Resolved feedback #1468.
|
2022-11-18 02:06:16 +00:00 |
|
|
mayue
|
3ef1c553c4
|
* Fix bug #29755.
|
2022-11-17 16:04:56 +08:00 |
|
|
wangyidong
|
9761648d59
|
Merge branch 'zentaopms_239'
|
2022-11-08 08:41:28 +08:00 |
|
|
hufangzhou
|
23dd1b4384
|
* Fix bug #29279.
|
2022-11-04 02:11:14 +00:00 |
|
|
tianshujie
|
3ee6f1c348
|
* Fix bug #28199.
|
2022-11-02 15:36:58 +08:00 |
|
|
wangyidong
|
148d3d6d6b
|
Merge branch 'master' into zentaopms_239
|
2022-10-27 11:39:47 +08:00 |
|
|
wangyuting2
|
aa9bc2b8ec
|
* Fix systemMode bug.
|
2022-10-10 07:32:11 +00:00 |
|
|
李玉春
|
2f26f526d7
|
Merge branch 'sprint/cyy_70499' into 'master'
Sprint/cyy 70499
See merge request easycorp/zentaopms!5629
|
2022-09-30 01:30:06 +00:00 |
|
|
wangyidong
|
d300ee00da
|
Merge branch 'master' into zentaopms_239
|
2022-09-30 09:07:53 +08:00 |
|
|
tianshujie
|
14071af088
|
* Fix bug #28191.
|
2022-09-29 17:36:57 +08:00 |
|
|
曹延义
|
74568631ac
|
* Finish task #70499.
|
2022-09-29 15:20:30 +08:00 |
|