Commit Graph
2603 Commits
Author SHA1 Message Date
李玉春 679e06a7d0 Merge branch 'devops21_zhangzilong_19255' into 'master'
* Code for bug #19255.

See merge request easycorp/zentaopms!1791
2022-02-14 08:52:02 +00:00
zhangzilong 921e887dbe * Code for bug #19255. 2022-02-14 16:30:03 +08:00
李玉春 eeefcf84ab Merge branch 'sunhuawei_fixbug_19425' into 'master'
Fix bug #19425.

See merge request easycorp/zentaopms!1786
2022-02-14 06:56:36 +00:00
孙华伟 aa3b14326c Fix bug #19425. 2022-02-14 14:53:32 +08:00
李玉春 2a5b157a7f Merge branch 'sprint/fixbug_zxd_19460' into 'master'
*Fux bug #19460 #19458.

See merge request easycorp/zentaopms!1784
2022-02-14 06:40:59 +00:00
zhouxudong a13a78f7bb *Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458. 2022-02-14 13:17:45 +08:00
liyuchun 5583b62fc9 Merge branch 'devops21' 2022-02-14 10:20:11 +08:00
李玉春 c856323c92 Merge branch 'sprint/task_zhouxudong_48844' into 'master'
*Finish task #48844.

See merge request easycorp/zentaopms!1773
2022-02-14 00:26:45 +00:00
周旭东 84b35d270b Update control.php 2022-02-14 00:26:15 +00:00
zhouxudong c3112657d2 *Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844. 2022-02-11 17:33:22 +08:00
李玉春 4bf3353189 Merge branch 'devops21_zhangzilong_19255' into 'devops21'
* Fix bug #19255.

See merge request easycorp/zentaopms!1771
2022-02-11 09:10:40 +00:00
zhangzilong b7f793a9eb * Code for bug #19255. 2022-02-11 17:09:50 +08:00
zhangzilong 2b58859434 * Code for bug #19255. 2022-02-11 16:54:49 +08:00
zhangzilong 789a1292ac * Fix bug #19255. 2022-02-11 16:49:32 +08:00
zhangzilong 741f568164 * Fix bug #19255. 2022-02-11 16:37:39 +08:00
zhangzilong e45058a891 * Fix bug *19255. 2022-02-11 16:20:41 +08:00
李玉春 1e9277e1eb Merge branch 'sprint/task_zhouxudong_48844' into 'master'
Sprint/task zhouxudong 48844

See merge request easycorp/zentaopms!1768
2022-02-11 08:20:22 +00:00
周旭东 a1529b8b5a Update linkbugs.html.php 2022-02-11 08:14:20 +00:00
zhouxudong 0e5f623acc *Finish task #48844. 2022-02-11 16:10:32 +08:00
zhangzilong 2317288f0a * Fix bug #19225. 2022-02-11 15:00:19 +08:00
zhouxudong 8af167a379 *Finish task #48844. 2022-02-11 13:04:08 +08:00
李玉春 fe0504586a Merge branch 'sprint/task_zhouxudong_48844' into 'master'
*Finish task #48844.

See merge request easycorp/zentaopms!1759
2022-02-11 01:08:59 +00:00
liyuchun e556307ba4 * Finish task #48612. 2022-02-11 08:13:20 +08:00
zhouxudong 818bb2ef63 *Finish task #48844. 2022-02-10 14:04:19 +08:00
zhangzilong 51d376d4f3 * Code for bug #19255. 2022-02-09 16:01:28 +08:00
zhangzilong a4e02734f6 * Code for bug 19255. 2022-02-09 15:03:33 +08:00
tanghucheng f1cda6821d * Fix bug. 2022-02-09 13:04:16 +08:00
zhangzilong 3c8b864a94 * Code for bug #19255. 2022-02-09 09:52:58 +08:00
zhangzilong ec4003a9a0 * Fix bug #19255. 2022-02-08 15:50:12 +08:00
孙广明 b46ec89098 * Fix bug close modal bug. 2022-02-08 14:01:40 +08:00
zhangzilong fb8708557d * Fix bug #19161. 2022-02-08 08:42:16 +08:00
mayue c262649293 * Fix bug #17979. 2022-02-07 15:37:26 +08:00
zhouxudong b767d5cbeb *Fix bug #19158. 2022-01-29 08:52:31 +08:00
liumengyi d0b9a47318 * Fix bug #18970. 2022-01-26 09:02:54 +08:00
tianshujie dfddd4e48b * Modify the code. 2022-01-21 13:19:02 +08:00
tianshujie fe23db6218 * Finish task #48012. 2022-01-21 12:23:38 +08:00
liumengyi 039437a741 * Modify bug smooth refresh variable. 2022-01-21 10:49:54 +08:00
liumengyi 02c47ead7c * Finish task #48012. 2022-01-21 10:39:54 +08:00
liumengyi 445a26f81e * Modify code format. 2022-01-20 17:22:10 +08:00
liumengyi 3ec206f626 * Finish task #48012.Add the bug smooth refresh of create, batchcreate, confiremBug,resolve. 2022-01-20 17:07:03 +08:00
朱金勇 fc7302c5ce Merge branch 'sprint/183_zhouxudong_trans47956' into 'master'
*Finish task #47956.

See merge request easycorp/zentaopms!1502
2022-01-20 07:38:21 +00:00
朱金勇 1ce16c8e3a Merge branch 'sprint/scx_international' into 'master'
Sprint/scx international

See merge request easycorp/zentaopms!1499
2022-01-20 07:38:04 +00:00
songchenxuan f458304c06 *Finish task #47951,47952,47953,47954. 2022-01-19 16:43:20 +08:00
zhouxudong f49dc4541c *Finish task #47956. 2022-01-19 16:29:40 +08:00
zhouxudong 93aafabf4f *Finish task #47955 #47957. 2022-01-19 15:50:41 +08:00
songchenxuan 2cc7870623 *Finish task #47951,47952,47953. 2022-01-19 10:22:02 +08:00
hufangzhou 0f9fa42664 * Fix bug #18673. 2022-01-18 15:31:10 +08:00
孙广明 431f7d100e Merge branch 'xieqiyu_fixbug' into 'master'
* Fix bug: Branch error when click header.

See merge request easycorp/zentaopms!1474
2022-01-18 06:05:48 +00:00
xieqiyu e35fa62b97 * Fix bug: Branch error when click header. 2022-01-18 14:01:46 +08:00
tianshujie 5d042bcbea * Modify the code. 2022-01-18 13:11:52 +08:00