 刘刚
|
617fa8ffcb
|
Merge branch dev/bug-63538 of zentao/zentaopms (#9923)
|
2025-06-25 16:53:30 +08:00 |
|
|
刘刚
|
7510ea87ef
|
Merge branch dev/bug-61859 of zentao/zentaopms (#9922)
|
2025-06-25 16:53:18 +08:00 |
|
|
刘刚
|
d84d8f1dc2
|
Merge branch dev/bug-63538 of zentao/zentaopms (#9921)
|
2025-06-25 15:54:01 +08:00 |
|
|
刘刚
|
5616804712
|
Merge branch dev/bug-61859 of zentao/zentaopms (#9920)
|
2025-06-25 15:53:52 +08:00 |
|
|
sunguangming
|
cb1c5187a2
|
* [bug#63538,done,0.2h] fix bug.
|
2025-06-25 07:40:39 +00:00 |
|
|
xieqiyu
|
c636093315
|
* [bug#61859] Return when in modal.
|
2025-06-25 07:28:20 +00:00 |
|
|
刘刚
|
0b7b0b360c
|
Merge branch release/21.7.2 of zentao/zentaopms (#9917)
|
2025-06-25 14:48:17 +08:00 |
|
|
刘刚
|
e93b7aa598
|
Merge branch release/21.7.2 of zentao/zentaopms (#9916)
|
2025-06-25 14:48:09 +08:00 |
|
|
刘刚
|
c961735ef4
|
Merge branch dev/bug-63693 of zentao/zentaopms (#9915)
|
2025-06-25 14:47:55 +08:00 |
|
|
wangyuting
|
cb730cf424
|
* [bug#63565,done,0.2h,0h] Remove testtask scene pri and assignedTo field.
|
2025-06-25 14:31:47 +08:00 |
|
|
刘刚
|
fee6c87914
|
Merge branch dev/bug-63665 of zentao/zentaopms (#9913)
|
2025-06-25 14:29:15 +08:00 |
|
|
刘刚
|
59ec23b626
|
Merge branch dev/bug-63515 of zentao/zentaopms (#9912)
|
2025-06-25 14:28:16 +08:00 |
|
|
sunguangming
|
4794533f4a
|
Merge branch 'dev/bug-63590' into release/21.7.2
|
2025-06-25 06:25:09 +00:00 |
|
|
刘刚
|
1bd45c5a41
|
Merge branch dev/bug-63693 of zentao/zentaopms (#9911)
|
2025-06-25 14:23:54 +08:00 |
|
|
刘刚
|
502e9745ac
|
Merge branch release/21.7.2 of zentao/zentaopms (#9910)
|
2025-06-25 14:21:48 +08:00 |
|
|
刘刚
|
9152c29640
|
Merge branch dev/bug-63665 of zentao/zentaopms (#9909)
|
2025-06-25 14:21:10 +08:00 |
|
|
刘刚
|
2ff7fe8ed6
|
Merge branch dev/bug-63515 of zentao/zentaopms (#9906)
|
2025-06-25 14:21:00 +08:00 |
|
|
刘刚
|
915dab55cf
|
Merge branch dev/bug-63552 of zentao/zentaopms (#9908)
|
2025-06-25 14:20:49 +08:00 |
|
|
xieqiyu
|
98bca67b6d
|
* [bug#63693] Fix the bug of add block to a regular type template.
|
2025-06-25 06:16:36 +00:00 |
|
|
sunguangming
|
c2fd3e94b4
|
* [misc] modify mysql to dm.
|
2025-06-25 06:11:45 +00:00 |
|
|
李阳
|
b2b2736c7c
|
Merge branch release/21.7.2 of zentao/zentaopms (#9868)
|
2025-06-25 13:58:16 +08:00 |
|
|
xieqiyu
|
3b9944bcf0
|
* [bug#63665] Get other module when upgrade template has no module.
|
2025-06-25 05:57:38 +00:00 |
|
|
刘刚
|
c70fe40c8e
|
Merge branch dev/bug-63552 of zentao/zentaopms (#9901)
|
2025-06-25 13:47:56 +08:00 |
|
|
sunguangming
|
e8c75950cc
|
* [misc] code for comment.
|
2025-06-25 05:37:24 +00:00 |
|
|
xieqiyu
|
dac116188c
|
* [bug#63515] Set type to markdown when upgrad the markdown template.
|
2025-06-25 05:29:00 +00:00 |
|
|
刘刚
|
865de21010
|
Merge branch dev/bug-63400 of zentao/zentaopms (#9905)
|
2025-06-25 13:21:16 +08:00 |
|
|
刘刚
|
e9c13639b9
|
Merge branch dev/bug-63400 of zentao/zentaopms (#9904)
|
2025-06-25 13:15:01 +08:00 |
|
|
tianshujie
|
35ad524b49
|
* [bug#63400,done,0.4h] adjust project code style.
|
2025-06-25 11:52:58 +08:00 |
|
|
刘刚
|
81724ba462
|
Merge branch dev/bug-63567 of zentao/zentaopms (#9902)
|
2025-06-25 11:46:11 +08:00 |
|
|
刘刚
|
4adc22a972
|
Merge branch dev/bug-63636 of zentao/zentaopms (#9898)
|
2025-06-25 11:44:15 +08:00 |
|
|
刘刚
|
bead73d051
|
Merge branch dev/bug-63624 of zentao/zentaopms (#9897)
|
2025-06-25 11:44:07 +08:00 |
|
|
刘刚
|
2f040dcb14
|
Merge branch dev/bug-63605 of zentao/zentaopms (#9895)
|
2025-06-25 11:43:54 +08:00 |
|
|
刘刚
|
7793bc36dc
|
Merge branch dev/bug-63567 of zentao/zentaopms (#9882)
|
2025-06-25 11:43:17 +08:00 |
|
|
sunguangming
|
6e4c8dfe6b
|
* [bug#63552,done,0.5h] fix bug.
|
2025-06-25 03:41:02 +00:00 |
|
|
刘刚
|
70494eb596
|
Merge branch dev/bug-63605 of zentao/zentaopms (#9852)
|
2025-06-25 11:06:58 +08:00 |
|
|
sunguangming
|
95e83c5cd0
|
* [misc] Code for comment.
|
2025-06-25 03:04:12 +00:00 |
|
|
刘刚
|
55d071e235
|
Merge branch dev/task-145697 of zentao/zentaopms (#9893)
|
2025-06-25 11:02:58 +08:00 |
|
|
刘刚
|
0d43c51343
|
Merge branch dev/bug-63423 of zentao/zentaopms (#9891)
|
2025-06-25 11:02:46 +08:00 |
|
|
刘刚
|
91730630d9
|
Merge branch dev/bug-63586 of zentao/zentaopms (#9890)
|
2025-06-25 11:02:40 +08:00 |
|
|
刘刚
|
21225a04c3
|
Merge branch dev/bug-63650 of zentao/zentaopms (#9889)
|
2025-06-25 11:02:35 +08:00 |
|
|
刘刚
|
73c954b047
|
Merge branch dev/task-145691 of zentao/zentaopms (#9888)
|
2025-06-25 11:02:29 +08:00 |
|
|
刘刚
|
01b17762d8
|
Merge branch dev/bug-63636 of zentao/zentaopms (#9885)
|
2025-06-25 11:00:33 +08:00 |
|
|
刘刚
|
1b0eb117e7
|
Merge branch dev/task-145697 of zentao/zentaopms (#9884)
|
2025-06-25 11:00:23 +08:00 |
|
|
刘刚
|
683f9c8366
|
Merge branch dev/bug-63624 of zentao/zentaopms (#9881)
|
2025-06-25 10:59:44 +08:00 |
|
|
刘刚
|
2c6dc060ef
|
Merge branch release/21.7.2 of zentao/zentaopms (#9878)
|
2025-06-25 10:57:12 +08:00 |
|
|
刘刚
|
6fb696a2c3
|
Merge branch dev/bug-63650 of zentao/zentaopms (#9877)
|
2025-06-25 10:57:02 +08:00 |
|
|
刘刚
|
81e525edb6
|
Merge branch dev/bug-63423 of zentao/zentaopms (#9874)
|
2025-06-25 10:56:12 +08:00 |
|
|
刘刚
|
28e8027c66
|
Merge branch dev/bug-63586 of zentao/zentaopms (#9870)
|
2025-06-25 10:55:54 +08:00 |
|
|
刘刚
|
2ab1cd5794
|
Merge branch dev/task-145691 of zentao/zentaopms (#9869)
|
2025-06-25 10:55:40 +08:00 |
|
|
刘刚
|
43dbc0b81c
|
Merge branch dev/bug-63626 of zentao/zentaopms (#9872)
|
2025-06-25 10:55:01 +08:00 |
|