Commit Graph
29330 Commits
Author SHA1 Message Date
tianshujie cfb4b274a4 * Fix bug #20170. 2022-03-01 20:06:44 +08:00
tianshujie cbfe4b0bd1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/186_tianshujie_19786 2022-03-01 15:51:34 +08:00
tianshujie 59ee1b9038 * Fix bug #19786. 2022-03-01 15:51:11 +08:00
liumengyi 8dd8c27d38 * Adjust code format. 2022-03-01 14:53:31 +08:00
liumengyi 02e14404c6 * Remove redundant code. 2022-03-01 14:43:15 +08:00
liumengyi 0854d8fe43 * Fix bug #20116. 2022-03-01 14:42:07 +08:00
王怡栋 5bfe2d0181 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-01 13:58:16 +08:00
王怡栋 38ed825461 * adjust for get testtask list. 2022-03-01 13:58:00 +08:00
王怡栋 fb1e105cbb Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!2021
2022-03-01 05:38:12 +00:00
王怡栋 44be255e67 * adjust task #49362 and check priv. 2022-03-01 11:23:44 +08:00
孙广明 fb48581a76 Merge branch 'sprint/186_tianshujie_fixbug' into 'master'
Sprint/186 tianshujie fixbug

See merge request easycorp/zentaopms!2022
2022-03-01 03:12:50 +00:00
liumengyi fe98c033c7 * Remove empty line. 2022-03-01 10:41:11 +08:00
孙广明 bd01479b5a * Merge code. 2022-03-01 10:40:52 +08:00
tianshujie 59c9f0dbeb * Fix bug #20164. 2022-03-01 10:33:46 +08:00
tianshujie b1afcd3a6e * Fix bug #20154. 2022-03-01 10:15:29 +08:00
王怡栋 2b08931a49 Merge branch 'sgm_fixbug' into 'master'
* Fix code detail.

See merge request easycorp/zentaopms!2016
2022-03-01 02:14:27 +00:00
tanghucheng b99e04cab3 * Fix bug. 2022-03-01 09:56:19 +08:00
孙广明 38289123a7 Merge branch 'sprint/186_hufangzhou_20155' into 'master'
* Fix bug #20155.

See merge request easycorp/zentaopms!2018
2022-03-01 01:44:20 +00:00
孙广明 3a55c67a51 Merge branch 'sprint/186_tianshujie_optimize' into 'master'
* Fix code review issues.

See merge request easycorp/zentaopms!2019
2022-03-01 01:44:10 +00:00
tianshujie 35dc1de44d * Fix code review issues. 2022-03-01 09:35:52 +08:00
hufangzhou 8a71dc32bb * Fix bug #20155. 2022-03-01 09:29:26 +08:00
孙广明 4e3f46d87a * Fix code detail. 2022-03-01 08:34:06 +08:00
王怡栋 36a36bd96c Merge branch 'sgm_fixbug' into 'master'
* Rename var.

See merge request easycorp/zentaopms!2015
2022-03-01 00:29:48 +00:00
孙广明 04b8ba2360 * Rename var. 2022-03-01 08:26:01 +08:00
王怡栋 19c8398090 Merge branch 'sprint/master_tanghucheng_lite' into 'master'
* Hide preference and tutorial.

See merge request easycorp/zentaopms!2010
2022-02-28 07:25:24 +00:00
孙广明 b6f0ad9ed2 Merge branch 'sprint/186_liumengyi_20103' into 'master'
* Fix bug #20103.

See merge request easycorp/zentaopms!2006
2022-02-28 07:18:58 +00:00
tanghucheng ccc11c4e4b * Hide preference and tutorial. 2022-02-28 15:18:57 +08:00
liumengyi 54fe05a303 * Fix bug #20103. 2022-02-28 15:16:36 +08:00
孙广明 5109d0a946 Merge branch 'sprint/186_hufangzhou_20119' into 'master'
* Fix bug #20119.

See merge request easycorp/zentaopms!2008
2022-02-28 06:53:58 +00:00
zhujinyong 9fd0e4c3ed * Fix xuan extension. 2022-02-28 14:52:46 +08:00
hufangzhou b79cd2db12 * Fix bug #20119. 2022-02-28 14:27:46 +08:00
王怡栋 4f6834011c * fix bug for revert team when edit project. 2022-02-28 14:21:45 +08:00
liumengyi 1ccbf30716 * Fix bug #20103. 2022-02-28 14:09:57 +08:00
tianshujie 9071214c7f * Fix bug #19834. 2022-02-28 11:23:52 +08:00
朱金勇 b6810e0b24 Merge branch 'sgm_upgrade' into 'master'
* Remove unused code.

See merge request easycorp/zentaopms!2003
2022-02-28 03:17:09 +00:00
孙广明 cc7e29e208 * Remove unused code. 2022-02-28 11:14:49 +08:00
Zongjun Lan 8dd88cb766 * fix task 49335 2022-02-28 11:02:52 +08:00
孙广明 6b1c882cac * Fix upgrade lang. 2022-02-28 10:16:30 +08:00
tianshujie 941bba2658 * Modify the repeated upgrade problem. 2022-02-28 09:51:53 +08:00
孙广明 df55b0af1b Merge branch '185' 2022-02-28 08:58:20 +08:00
孙广明 ec16236bb5 * Fix upgrade bug. 2022-02-28 08:45:04 +08:00
liumengyi 51ef04f29c * FIx bug #19924. 2022-02-25 15:58:26 +08:00
hufangzhou 9640120b43 * Can not use vision field of zt_action table when upgrade. 2022-02-25 15:28:15 +08:00
孙广明 3627387370 Merge branch 'sprint/185_mayue_49285' into 'sprint/185'
* Finish task#49285.

See merge request easycorp/zentaopms!1871
2022-02-25 06:32:20 +00:00
mayue 37a9564c95 * Optimize code. 2022-02-25 14:20:37 +08:00
mayue c3ef97bf47 * Optimize code. 2022-02-25 14:15:25 +08:00
mayue 245542e972 * Optimize code. 2022-02-25 14:00:54 +08:00
孙广明 8f89f4d64f Merge branch '185_sunhuawei_story_30529' into 'sprint/185'
185 sunhuawei story 30529

See merge request easycorp/zentaopms!1958
2022-02-25 05:45:27 +00:00
孙华伟 68ef9809dd * 2022-02-25 13:37:32 +08:00
孙广明 7ba3ed1dfc Merge branch 'spring/185_zhengrunyu_49305' into 'sprint/185'
* Fix bug 19941 19923 19922 19787.

See merge request easycorp/zentaopms!1980
2022-02-25 05:26:24 +00:00