Commit Graph

661 Commits

Author SHA1 Message Date
leiyong
76dc008820 * Processing product default value error. 2022-07-15 02:30:21 +00:00
leiyong
949d7e2ce5 * Fix the product default value error. 2022-07-15 01:14:52 +00:00
xieqiyu
a44ba79b1d * Fix bug#25027. 2022-07-14 13:35:17 +08:00
zhouxudong
ce70c10870 * Code optimization. 2022-07-13 09:20:34 +00:00
zhouxudong
73dd8c3eeb * Fix bug about kanban actions. 2022-07-13 07:17:04 +00:00
王怡栋
0ac2e857a4 Merge branch 'sprint214_leiyong_task_60384' into 'master'
Sprint214 leiyong task 60384

See merge request easycorp/zentaopms!4495
2022-07-13 02:25:36 +00:00
leiyong
5b91324e83 * Finish task#60384. 2022-07-13 02:15:09 +00:00
王怡栋
65e48dadb8 Merge branch 'sprint/master_zhouxudong_60393' into 'master'
* Finish task #60393.

See merge request easycorp/zentaopms!4487
2022-07-13 02:02:44 +00:00
孙广明
105ac0b70f Merge branch 'stagetasktree' 2022-07-13 08:48:30 +08:00
zhouxudong
adaa8667d7 * Finish task #60393. 2022-07-12 09:30:15 +00:00
王怡栋
11f2eb8a0f Merge branch 'sprint/215_liumengyi_60476' into 'master'
Sprint/215 liumengyi 60476

See merge request easycorp/zentaopms!4485
2022-07-12 09:20:31 +00:00
王怡栋
8bbc43b99c Merge branch 'sprint/master_zhouxudong_60393' into 'master'
* Finish task #60393.

See merge request easycorp/zentaopms!4468
2022-07-12 07:23:46 +00:00
zhouxudong
09eabd3b84 * Finish task #60393. 2022-07-12 07:15:27 +00:00
zenggang
6a84cd7469 * Code for task#60640 2022-07-12 07:15:13 +00:00
xieqiyu
658a187e47 * Fix bug of story and bug action in execution. 2022-07-12 14:05:40 +08:00
liumengyi
154c18ee43 * Finish task #60476. 2022-07-12 11:07:16 +08:00
zhouxudong
951d41d721 * Finish task #60393. 2022-07-12 02:54:06 +00:00
zenggang
f3dd489f61 * Adjust code 2022-07-12 02:32:01 +00:00
zenggang
5d116c16c9 * Finish task#60640 2022-07-12 02:29:20 +00:00
王怡栋
4c3d59333a Merge branch 'sprint/215_liumengyi_60395' into 'master'
* Finish task #60395.

See merge request easycorp/zentaopms!4450
2022-07-11 07:56:19 +00:00
mayue
ea0500a20c * Finish task #60641. 2022-07-11 15:26:14 +08:00
liumengyi
b8642a3350 * Finish task #60395. 2022-07-11 14:49:36 +08:00
liumengyi
29993afa9e * Optimize code for bug #23123. 2022-07-08 13:55:41 +08:00
liumengyi
26b430660a * Fix bug #23123. 2022-07-08 13:29:56 +08:00
zenggang
a01d530a0a * Hide cfd stat 2022-07-08 01:38:33 +00:00
孙广明
118e1f7854 Merge branch 'master_xieqiyu_kanban' into 'master'
Master xieqiyu kanban

See merge request easycorp/zentaopms!4420
2022-07-08 01:20:53 +00:00
mayue
f6d94ad4cb * Fix bug #24848#24817. 2022-07-08 09:06:39 +08:00
xieqiyu
29efcab628 * Code for task#59543. 2022-07-07 17:42:30 +08:00
xieqiyu
07231be2d2 * Code for task#59543. 2022-07-07 17:23:09 +08:00
liumengyi
ef6ffd019b * Fix bug of task #59480, #59481. 2022-07-07 15:46:36 +08:00
liumengyi
ecdd330102 * Fix bug of task #59480,#59481. 2022-07-07 14:41:10 +08:00
liumengyi
e709c4bbda * Finish task #59480, #59481. 2022-07-07 14:12:45 +08:00
王怡栋
10b95d1e48 Merge branch 'master_xieqiyu_kanban' into 'master'
Master xieqiyu kanban

See merge request easycorp/zentaopms!4398
2022-07-07 05:10:07 +00:00
xieqiyu
157c60bd64 * Code for task#59546. Update unlink story. 2022-07-07 10:04:24 +08:00
王怡栋
5879801b8b Merge branch 'sprint/211_liumengyi_59482' into 'master'
* Finish task #59482.

See merge request easycorp/zentaopms!4395
2022-07-07 01:49:35 +00:00
liumengyi
59bbb4577a * Finish task #59482. 2022-07-07 09:44:33 +08:00
liumengyi
3049879a44 * Fix bug of task #59482. 2022-07-07 09:40:07 +08:00
xieqiyu
e10272248b * Code for task#59546. Update create story and copy bug. 2022-07-07 09:06:33 +08:00
liumengyi
73fe07dd49 * Finish task #59482. 2022-07-06 16:18:44 +08:00
zenggang
8773257051 * Finish task#59703,59711 2022-07-06 06:42:19 +00:00
孙广明
613c00bed9 * Code for stage/task. 2022-07-06 13:31:14 +08:00
孙广明
9a6689837b * Add date to cfd. 2022-07-06 09:16:36 +08:00
孙广明
6fe5ef5a23 Merge branch 'sprint_59473' into 'master'
Sprint 59473

See merge request easycorp/zentaopms!4362
2022-07-06 01:13:32 +00:00
sunjun
e5ed8133b1 sprint_59473 2022-07-06 01:06:35 +00:00
sunjun
84e078c1b2 sprint_59473 2022-07-05 14:35:33 +00:00
孙广明
781259ee6f * Code for CFD. 2022-07-05 21:11:03 +08:00
sunjun
2a28c13c7e sprint_59473 2022-07-05 07:39:55 +00:00
王怡栋
ae7cc6764d Merge branch 'sgm_kanban' into 'master'
* Finish task #59701.

See merge request easycorp/zentaopms!4348
2022-07-05 07:08:41 +00:00
孙广明
25028997fa * Finish task #59701. 2022-07-05 15:03:15 +08:00
zenggang
e4af7eab3b * Fix bug #24689 2022-07-04 09:13:46 +00:00