Commit Graph
622 Commits
Author SHA1 Message Date
xieqiyu e10272248b * Code for task#59546. Update create story and copy bug. 2022-07-07 09:06:33 +08:00
zenggang 8773257051 * Finish task#59703,59711 2022-07-06 06:42:19 +00: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
zhouxudong c568a46744 * Fix bug #22964. 2022-07-01 07:20:01 +00:00
xieqiyu 1b338f5cf5 * Fix bug#24216. 2022-06-30 14:09:52 +08:00
孙广明 4dc9c76e9c Merge branch 'sprint209_leiyong_task_58578' into 'master'
* Finish task#58578.

See merge request easycorp/zentaopms!4200
2022-06-29 05:34:12 +00:00
leiyong f888f66bf5 * Finish task#58578. 2022-06-28 09:59:34 +00:00
zenggang 15feb917ce * Finish task#58772,58774,58775 2022-06-28 05:39:31 +00:00
zhouxudong be59d6249b * Finish task #58575. 2022-06-28 01:25:06 +00:00
zhouxudong 6e2b3acd80 * Finish task #58575. 2022-06-28 01:08:01 +00:00
zhouxudong d8acac2813 * Finish task #58575 #58602. 2022-06-28 00:49:54 +00:00
zhouxudong 6314aad2e3 * Finish task #58575 #58602. 2022-06-27 08:38:11 +00:00
王怡栋 77d1ab4daf Merge branch 'master' into 'sprint/206_liumengyi_58288'
# Conflicts:
#   db/update17.1.sql
2022-06-23 01:46:35 +00:00
liumengyi c26c9dc110 * Optimize code for task #58288. 2022-06-23 09:39:29 +08:00
王怡栋 c69384617a Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.

See merge request easycorp/zentaopms!4083
2022-06-23 00:39:25 +00:00
liumengyi 4c5ff19a61 * Finish task #58288. 2022-06-22 17:01:39 +08:00
liumengyi b7a32b354b * Finish task #58288. 2022-06-22 16:15:06 +08:00
zenggang ba8f8b2644 * Finish task#58291 2022-06-22 05:35:32 +00:00
xieqiyu 21b0217aa8 * Code for task#57850. 2022-06-22 13:15:44 +08:00
mayue d97b5aeb97 * Fix bug #23765. 2022-06-21 13:30:00 +08:00
leiyong 80c03beea7 * Fix bug#23821. 2022-06-16 11:16:17 +00:00
王怡栋 af2b0ef327 Merge branch 'master_xieqiyu_23762' into 'master'
* Fix bug#23762.

See merge request easycorp/zentaopms!3989
2022-06-16 09:03:19 +00:00
xieqiyu e0a9d3b339 * Fix bug#23762. 2022-06-16 16:56:57 +08:00
xieqiyu 783d4471b0 * Fix bug#23797. 2022-06-16 15:50:25 +08:00
tianshujie da9801d9eb * Finish task #57095. 2022-06-16 09:08:05 +08:00
孙广明 1f13b14799 Merge branch 'master' into 'sprint/204_tianshujie_57095'
# Conflicts:
#   module/execution/css/all.css
2022-06-15 09:03:47 +00:00
王怡栋 a6b264d1a7 Merge branch 'sprint202_leiyong_task_56926' into 'master'
Sprint202 leiyong task 56926

See merge request easycorp/zentaopms!3942
2022-06-15 08:20:11 +00:00
leiyong 32b846cdf5 * Finish task#56926. 2022-06-15 07:57:50 +00:00
tianshujie 2c176439d3 * Finish task #57095. 2022-06-15 15:09:34 +08:00
孙广明 80a39e398d Merge branch 'sprint/204_liumengyi_57089' into 'master'
* Fix bug #23738.

See merge request easycorp/zentaopms!3930
2022-06-15 05:27:13 +00:00
liumengyi 23be41cd71 * Fix bug #23738. 2022-06-15 13:25:41 +08:00
孙广明 9df2853a61 Merge branch 'sprint_204_57094' into 'master'
Sprint 204 57094

See merge request easycorp/zentaopms!3928
2022-06-15 03:09:37 +00:00
liumengyi 8a8666f158 * Finish task #57099. 2022-06-15 10:06:26 +08:00
liumengyi ee49b70482 * Finish task #57089. 2022-06-14 16:42:12 +08:00
sunjun 431a832cda sprint_204_57094 2022-06-14 08:13:25 +00:00
王怡栋 ee4ce60394 Merge branch 'sprint/204_liumengyi_23648' into 'master'
* Fix bug #23648.

See merge request easycorp/zentaopms!3912
2022-06-14 07:26:14 +00:00
liumengyi 5ad98df2ca * Fix bug #23648. 2022-06-14 15:17:57 +08:00
孙广明 dbb1ccc413 Merge branch 'sprint/203_zg_56558' into 'master'
* Finish task#56558

See merge request easycorp/zentaopms!3892
2022-06-14 06:58:39 +00:00
王怡栋 d682c68483 Merge branch 'master_xieqiyu_56931' into 'master'
* Finish task#56931.

See merge request easycorp/zentaopms!3906
2022-06-14 06:30:53 +00:00
xieqiyu 8814f0f6dd * Finish task#56931. 2022-06-14 14:12:57 +08:00
zhouxudong c16b1fd1c3 * Finish task #56910. 2022-06-14 02:44:20 +00:00
zhouxudong 3fcccf17f1 * Finish task #56910. 2022-06-14 01:47:39 +00:00