Commit Graph
34153 Commits
Author SHA1 Message Date
zhangzilong 861d6d3e47 * Finish task #49280. 2022-02-24 10:44:13 +08:00
zhangzilong a68221ccaf * Finish task #49280. 2022-02-24 10:41:54 +08:00
zhangzilong a9e3772439 * Finish task #49280. 2022-02-24 09:30:52 +08:00
王怡栋 60937d3a52 Merge branch 'sprint/185_lwr_visionSwitch' into 'sprint/185'
Add vision switcher and tweak menu arrows.

See merge request easycorp/zentaopms!1842
2022-02-18 03:13:11 +00:00
李玉春 a618eea106 Merge branch 'Add_sql' into 'sprint/185'
*Add sql

See merge request easycorp/zentaopms!1845
2022-02-18 01:20:56 +00:00
zhengrunyu 45900728eb *Add sql 2022-02-18 09:19:21 +08:00
孙广明 58212c71b7 Merge branch 'sprint/185_fixbug_wangyidong' into 'sprint/185'
* adjust for set vision.

See merge request easycorp/zentaopms!1844
2022-02-18 00:51:08 +00:00
王怡栋 3082abe478 * adjust for set vision. 2022-02-18 08:36:54 +08:00
王怡栋 2eae8b3c38 Merge branch 'sprint/185_fixbug_lanzongjun_49422' into 'sprint/185'
* Fix bug #49422

See merge request easycorp/zentaopms!1843
2022-02-17 09:34:03 +00:00
Zongjun Lan 20732c0d2a * Fix bug #49422 2022-02-17 17:32:12 +08:00
Zongjun Lan 41e878cf47 隐藏验收标准和影响范围 2022-02-17 17:22:48 +08:00
Wenrui LI a02c9baf3d * add vision switcher and tweak menu arrows. 2022-02-17 16:20:57 +08:00
王怡栋 218546e6c4 Merge branch 'sprint/tanghucheng_fixbug' into 'sprint/185'
* finish task #49421,49338.

See merge request easycorp/zentaopms!1838
2022-02-17 08:20:10 +00:00
tanghucheng 172443d36f * Finish task #49342. 2022-02-17 16:07:54 +08:00
孙广明 3d519133fa Merge branch 'sprint/185_xieqiyu_49292' into 'sprint/185'
* Finish task#49292.

See merge request easycorp/zentaopms!1835
2022-02-17 07:32:16 +00:00
孙广明 b52c8bbafd Merge branch 'sprint/185_zxd_49307' into 'sprint/185'
Sprint/185 zxd 49307

See merge request easycorp/zentaopms!1841
2022-02-17 07:31:29 +00:00
liyuchun 1f860b319c Merge branch 'sprint/185_zhengrunyu_49286' into sprint/185 2022-02-17 15:25:34 +08:00
李玉春 62097d0731 Merge branch 'sprint/185' into 'sprint/185_zhengrunyu_49286'
# Conflicts:
#   db/update16.4.sql
2022-02-17 07:23:41 +00:00
孙广明 a44789c872 Merge branch 'sprint/185_liumengyi_49371' into 'sprint/185'
* Finish task #49371.

See merge request easycorp/zentaopms!1840
2022-02-17 07:22:54 +00:00
zhouxudong 54c7b99bc6 * Add space. 2022-02-17 15:21:42 +08:00
liumengyi c7fb090e53 * Code for task #49371. 2022-02-17 15:21:19 +08:00
liumengyi 99fa224404 * Finish task #49371. 2022-02-17 15:07:51 +08:00
liumengyi c6174efcea * Finish task #49371. 2022-02-17 15:06:48 +08:00
zhouxudong aae63736d3 *Finish task #49307. 2022-02-17 15:05:22 +08:00
zhengrunyu 3dbbc4b3f0 *Finish task 49286. 2022-02-17 15:02:18 +08:00
tanghucheng 966f00c07a * finish task #49421,49338. 2022-02-17 14:58:59 +08:00
孙广明 36eec1ed28 Merge branch 'sprint/185_mayue_Bug11007' into 'sprint/185'
* Fix bug #11007.

See merge request easycorp/zentaopms!1836
2022-02-17 06:37:25 +00:00
zhengrunyu 56b22d9b83 * Add sql 2022-02-17 14:35:30 +08:00
xieqiyu 70391990a0 * Finish task#49292. 2022-02-17 14:14:09 +08:00
孙广明 cb2ebf1727 Merge branch 'sprint/185_fixbug_wangyidong' into 'sprint/185'
Sprint/185 fixbug wangyidong

See merge request easycorp/zentaopms!1833
2022-02-17 05:53:08 +00:00
王怡栋 3f72bfc6b7 Merge branch 'sprint/185' of https://gitlab.zcorp.cc/easycorp/zentaopms into 185 2022-02-17 11:09:17 +08:00
王怡栋 959ac74bd4 Merge branch 'sprint/185_lwr_fixMerge' into 'sprint/185'
Fix merge

See merge request easycorp/zentaopms!1831
2022-02-17 03:08:20 +00:00
王怡栋 7064d365d7 Merge branch 'sgm_185' into 'sprint/185'
* Finish task #49429.

See merge request easycorp/zentaopms!1830
2022-02-17 03:07:57 +00:00
王怡栋 cbcbe766a4 Merge branch 'sprint/185_tanghucheng_fixbug' into 'sprint/185'
* fix bug.

See merge request easycorp/zentaopms!1832
2022-02-17 03:07:21 +00:00
王怡栋 3ebcfb1ddc * fix bug #19693. 2022-02-17 11:06:28 +08:00
tanghucheng f05ad59be3 * fix bug. 2022-02-17 11:04:10 +08:00
zhengrunyu 5083af2323 *Finish task 49286. 2022-02-17 10:47:56 +08:00
Wenrui LI 4ec144c99e * fix bad merge. 2022-02-17 10:42:11 +08:00
孙广明 19f7a89486 * Finish task #49429. 2022-02-17 10:41:12 +08:00
孙广明 bd31f6f4ff Merge branch 'sprint/185_liumengyi_fixbug' into 'sprint/185'
* Fix bug for kanban priv.

See merge request easycorp/zentaopms!1829
2022-02-17 02:37:17 +00:00
liumengyi 6dc1c744a1 * Fix bug for kanban priv. 2022-02-17 10:34:17 +08:00
zhouxudong 5473987cb0 *Finish task #49307. 2022-02-17 10:24:37 +08:00
zhujinyong d02ddc138c Merge branch 'lite' into sprint/185 2022-02-17 10:20:50 +08:00
mayue e80390a8f2 * Fix bug #11007. 2022-02-17 09:35:33 +08:00
zhujinyong 5bd64d9312 Merge branch 'lite' into sprint/185 2022-02-17 08:56:40 +08:00
liyuchun a7bcb16751 Merge branch '185_fixbug' into 185 2022-02-17 08:24:32 +08:00
tanghucheng 39516e5d70 * fix bug #19657. 2022-02-16 17:07:20 +08:00
tanghucheng 8104870b83 * code for task #49080. 2022-02-16 15:11:44 +08:00
孙广明 e9a29f39fc * Fix details. 2022-02-16 13:05:56 +08:00
孙广明 7f50a2cbd9 * Fix code error. 2022-02-16 11:26:40 +08:00