Commit Graph
2283 Commits
Author SHA1 Message Date
王怡栋 b022b8b7f5 Merge branch 'master_xieqiyu_25084' into 'master'
* Fix bug#25084.

See merge request easycorp/zentaopms!4567
2022-07-15 02:36:35 +00:00
leiyong 76dc008820 * Processing product default value error. 2022-07-15 02:30:21 +00:00
xieqiyu f9e7b52cca * Fix bug#25084. 2022-07-15 09:28:00 +08:00
leiyong 949d7e2ce5 * Fix the product default value error. 2022-07-15 01:14:52 +00:00
tianshujie f9e6fe5de4 * Fix bug #25329. 2022-07-14 17:14:54 +08:00
王怡栋 fc378df8b6 Merge branch 'master_xieqiyu_25027' into 'master'
* Fix bug#25027.

See merge request easycorp/zentaopms!4545
2022-07-14 08:24:13 +00:00
xieqiyu efe88fea99 * Adjust comment. 2022-07-14 15:28:30 +08:00
孙广明 6b19ed146d Merge branch 'sprint/tianshujie_25268' into 'master'
Sprint/tianshujie 25268

See merge request easycorp/zentaopms!4547
2022-07-14 07:24:17 +00:00
tianshujie a4a71d2972 * Fix bug #25093. 2022-07-14 15:18:49 +08:00
tianshujie 711c0e9e8c * Fix bug #25088. 2022-07-14 14:46:46 +08:00
xieqiyu a44ba79b1d * Fix bug#25027. 2022-07-14 13:35:17 +08:00
孙广明 083ebb7f29 * Fix stage-task tree list bug. 2022-07-14 13:29:23 +08:00
tianshujie b9859380ff * Fix bug #25093. 2022-07-14 13:22:04 +08:00
王怡栋 196ee9ff18 Merge branch 'master_xieqiyu_25094' into 'master'
* Fix bug#25094.

See merge request easycorp/zentaopms!4530
2022-07-14 05:03:50 +00:00
孙广明 327cc16810 * Parent stage don't have link. 2022-07-14 10:53:08 +08:00
zenggang fd9b0b1053 * Fix bug#25241 2022-07-14 02:20:00 +00:00
xieqiyu bbab93d08d * Fix bug#25094. 2022-07-14 09:59:06 +08:00
孙广明 6a4d372473 Merge branch 'sprint216_zg_bug' into 'master'
* Fix bug#25222,25232

See merge request easycorp/zentaopms!4527
2022-07-14 01:46:53 +00:00
孙广明 d41303c7e2 Merge branch 'fixbug_dynamic' into 'master'
fixbug_dynamic

See merge request easycorp/zentaopms!4515
2022-07-14 01:44:53 +00:00
孙广明 1444773e4d Merge branch 'sprint/mastr_zhouxudong_code' into 'master'
* Code optimization.

See merge request easycorp/zentaopms!4522
2022-07-14 01:44:40 +00:00
zenggang 38e996bd18 * Fix bug#25222,25232 2022-07-14 01:38:00 +00:00
孙广明 383a864001 * Add disabled to unclikable btn. 2022-07-14 08:39:56 +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
sunjun d5c9657af2 fixbug 2022-07-13 06:16:14 +00:00
王怡栋 42629df5ab Merge branch 'sprint/215_liumengyi_fixbug' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!4511
2022-07-13 05:43:07 +00:00
liumengyi a743cf4b3f * Optimize code. 2022-07-13 13:41:48 +08:00
hufangzhou d133a2b5e8 * Add the new version. 2022-07-13 13:28:45 +08:00
王怡栋 30e7879a41 Merge branch 'sprint/215_liumengyi_fixbug' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!4493
2022-07-13 03:12:44 +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
孙广明 d7999be8bf * Remove sprint create child btn. 2022-07-13 10:09:14 +08: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
liumengyi be11f49b45 * Optimize code. 2022-07-13 09:46:02 +08:00
孙广明 28f6cefe13 * Add burn to execution list. 2022-07-13 09:00:16 +08:00
孙广明 032f5e963a * Add space to execution list. 2022-07-13 08:51:09 +08:00
孙广明 105ac0b70f Merge branch 'stagetasktree' 2022-07-13 08:48:30 +08:00
孙广明 5264032497 * Finish executio task tree. 2022-07-13 08:48:00 +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
liumengyi d748d207fb * Optimize code. 2022-07-12 17:18:07 +08:00
王怡栋 d0c15d321f Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
Sprint/master zhouxudong fixbug

See merge request easycorp/zentaopms!4472
2022-07-12 07:41:56 +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
王怡栋 58941466a6 Merge branch 'master_xieqiyu_fixKanbanBug' into 'master'
* Fix bug of story and bug action in execution.

See merge request easycorp/zentaopms!4471
2022-07-12 07:03:09 +00:00
孙广明 507eb73497 Merge branch 'sprint/216_mayue_bug#25081' into 'master'
* Fix bug #25081.

See merge request easycorp/zentaopms!4473
2022-07-12 06:28:56 +00:00
mayue 0a5cf0a831 * Optimize code. 2022-07-12 14:28:17 +08:00
mayue a21626979e * Fix bug #25081. 2022-07-12 14:25:58 +08:00
zhouxudong 69101c8409 * Fix bug about taskkanban. 2022-07-12 06:06:02 +00:00