Commit Graph
319 Commits
Author SHA1 Message Date
Zongjun Lan af893de5d8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-03-11 15:06:54 +08:00
Zongjun Lan b51e39e69f * fix bug #20640 2022-03-11 14:58:39 +08:00
王怡栋 951fdbc1b6 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20652,#20511,#20643

See merge request easycorp/zentaopms!2187
2022-03-11 06:31:15 +00:00
Zongjun Lan 1c518b7a9b * fix bug #20643 2022-03-11 13:27:29 +08:00
Zongjun Lan cb8f6ca375 * fix bug #20652 2022-03-11 10:38:23 +08:00
王怡栋 7f8d7c6593 * fix bug #20490. 2022-03-11 10:26:33 +08:00
王怡栋 55beac7f83 * fix bug #20581. 2022-03-10 16:31:46 +08:00
Zongjun Lan a8541d33b6 Merge branch 'sprint/master_lanzongjun_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-03-10 14:39:01 +08:00
Zongjun Lan 76895b87c8 * fix bug #20511 2022-03-10 14:38:27 +08:00
王怡栋 a906254ba5 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20476 #20475

See merge request easycorp/zentaopms!2165
2022-03-09 09:15:06 +00:00
Zongjun Lan 81851a3648 * fix bug #20476 #20475 2022-03-09 16:18:01 +08:00
王怡栋 0529d3b656 Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug #20458,20369,20140,20373.

See merge request easycorp/zentaopms!2153
2022-03-09 03:52:04 +00:00
王怡栋 86c4b382a6 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-09 10:53:57 +08:00
王怡栋 f5d4dfc9ad * code for task #49356. 2022-03-09 10:53:08 +08:00
tanghucheng 2d3c8464d3 * Fix bug #20458,20369,20140,20373. 2022-03-09 10:20:46 +08:00
王怡栋 c753960b31 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #50357

See merge request easycorp/zentaopms!2147
2022-03-08 09:19:09 +00:00
Zongjun Lan d713bf7b1f * fix bug 50357 2022-03-08 17:11:52 +08:00
Zongjun Lan b7ba61136e * fix bug 50357 2022-03-08 16:32:29 +08:00
王怡栋 1e8e9d5a45 * code for kanban menu. 2022-03-08 13:28:48 +08:00
王怡栋 72d89e3c9f * adjust for buildIndex menu. 2022-03-08 13:03:34 +08:00
王怡栋 aff63f4ff7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-08 10:54:08 +08:00
王怡栋 b960a07ecf * code for task #49352. 2022-03-08 10:52:48 +08:00
王怡栋 ed5aa3d335 Merge branch 'sprint/master_tanghucheng_bug' into 'master'
* Fix bug #50369.

See merge request easycorp/zentaopms!2133
2022-03-08 02:26:35 +00:00
tanghucheng b279fbbc3e * Fix bug #50369. 2022-03-08 10:19:07 +08:00
王怡栋 eaba6dcc3c Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug #20329,20350,20366.

See merge request easycorp/zentaopms!2123
2022-03-07 09:09:58 +00:00
tanghucheng 15e6262065 * Fix bug #20329,20350,20366. 2022-03-07 16:42:58 +08:00
王怡栋 c3702f6928 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-07 15:53:18 +08:00
王怡栋 d801778065 * code for task #50361. 2022-03-07 15:53:04 +08:00
王怡栋 b2aa0be020 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug 19010,19464,19496

See merge request easycorp/zentaopms!2112
2022-03-07 07:41:30 +00:00
Zongjun Lan 812f676b3a * fix bug 19464 2022-03-07 14:09:57 +08:00
tanghucheng d61a43c7c1 * Fix bug. 2022-03-07 13:21:50 +08:00
tanghucheng 79a38cc9ad * Fix bug. 2022-03-07 13:04:06 +08:00
Zongjun Lan cc54fde953 * fix bug 18600 2022-03-04 17:08:45 +08:00
Zongjun Lan 4ceee5419d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-03-04 15:24:47 +08:00
Zongjun Lan 47adf87fc2 * fix bug 20022 2022-03-04 15:05:14 +08:00
王怡栋 6a3af094fe Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug 20234,20022

See merge request easycorp/zentaopms!2072
2022-03-04 06:38:10 +00:00
Zongjun Lan 23d699311d * fix bug 20022 2022-03-04 14:27:25 +08:00
Zongjun Lan a603cb92b9 * fix bug 20234 2022-03-04 11:00:54 +08:00
王怡栋 21e6b61e91 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug 20010,19904

See merge request easycorp/zentaopms!2062
2022-03-04 00:53:35 +00:00
Zongjun Lan 3d9d1c7bc2 * remove file 2022-03-04 08:49:17 +08:00
Zongjun Lan 9f15d5cfdb * code format 2022-03-04 08:48:20 +08:00
Zongjun Lan 76b6c421ab * code format 2022-03-04 08:46:52 +08:00
Zongjun Lan b4695acd3a * fix bug 20010,19904 2022-03-03 15:55:48 +08:00
王怡栋 aa83dc4428 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug 20029,19713

See merge request easycorp/zentaopms!2049
2022-03-03 06:48:24 +00:00
王怡栋 6c76f4b11e Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix priv.

See merge request easycorp/zentaopms!2052
2022-03-03 05:22:12 +00:00
Zongjun Lan c1f97b8d1a * format code 2022-03-03 10:18:12 +08:00
Zongjun Lan 0512526c23 * fix bug 19713 2022-03-03 10:07:55 +08:00
Zongjun Lan 97a174cefe * modify tree config 2022-03-02 15:42:55 +08:00
Zongjun Lan 5979f32712 * fix bug 20029 2022-03-02 15:04:12 +08:00
tanghucheng 59aaaa4fc0 * Fix priv. 2022-03-02 15:02:44 +08:00