Commit Graph
29634 Commits
Author SHA1 Message Date
李玉春 a944fe18f5 Merge branch 'sprint/187_tianshujie' into 'master'
Sprint/187 tianshujie

See merge request easycorp/zentaopms!2166
2022-03-09 08:25:00 +00:00
zhujinyong 1076396a79 * Refactor upgrade. 2022-03-09 16:20:53 +08:00
tianshujie ffd4850a9d * Finish task #20479. 2022-03-09 16:17:32 +08:00
tianshujie 1afb4315be * Finish task #50389. 2022-03-09 16:06:41 +08:00
tianshujie eab4c059a3 * Finish task #50388. 2022-03-09 16:02:00 +08:00
tianshujie 8cd6a13955 * Fix bug #20535. 2022-03-09 15:08:17 +08:00
tianshujie b4c0fff8e0 * Fix bug #20531. 2022-03-09 14:55:04 +08:00
tianshujie a349c5bfeb * Fix bug #20530. 2022-03-09 14:01:41 +08:00
孙广明 ebfdd2a742 Merge branch 'autoTest_liumengyi' into 'master'
* Add auto test for task.

See merge request easycorp/zentaopms!2159
2022-03-09 05:53:01 +00:00
liumengyi b1623bb73a * Add auto test for task. 2022-03-09 13:46:19 +08:00
tianshujie 6efc56ebd1 * Fix bug #20506. 2022-03-09 13:39:35 +08:00
王怡栋 e7fff4a211 Merge branch 'sprint/187_tianshujie_fixbug' into 'master'
Sprint/187 tianshujie fixbug

See merge request easycorp/zentaopms!2154
2022-03-09 05:23:40 +00:00
tianshujie e7670ff411 * Add spaces. 2022-03-09 13:22:43 +08:00
tianshujie e4dba8b073 * Modify the code writing logic. 2022-03-09 12:40:28 +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
tanghucheng 07f2f81d43 * Fix bug #20432. 2022-03-09 10:55:55 +08: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
tianshujie 57da5c00a9 * Fix bug #20503. 2022-03-09 10:47:16 +08:00
tianshujie d6692b22c1 * Fix bug #20522. 2022-03-09 10:39:45 +08:00
tianshujie 234a2352ec * Fix bug #20487. 2022-03-09 10:37:10 +08:00
tanghucheng 2d3c8464d3 * Fix bug #20458,20369,20140,20373. 2022-03-09 10:20:46 +08:00
tianshujie 06701aa5a0 * Fix style issues when raising bugs. 2022-03-09 09:34:52 +08:00
孙广明 200ba77298 * Code for version. 2022-03-09 09:04:16 +08:00
tianshujie e1dd273c3c * Modify the add contact popup style. 2022-03-09 08:49:13 +08:00
孙广明 5ea6b26500 * Code for upgrade check table. 2022-03-09 08:47:24 +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 12245e26a7 * fix code format 2022-03-08 17:18:05 +08: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
王怡栋 fb22e1dcb0 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug 50368

See merge request easycorp/zentaopms!2128
2022-03-08 07:54:22 +00:00
Zongjun Lan 64d797b109 * fix bug 50368 2022-03-08 15:49:39 +08:00
李玉春 ad432a9454 Merge branch 'sprint/187_tianshujie_fixbug' into 'master'
* Finish task #50380.

See merge request easycorp/zentaopms!2143
2022-03-08 06:38:52 +00:00
tianshujie 54ac0f8c8e * Finish task #50380. 2022-03-08 13:52:34 +08:00
孙广明 0c7bb72c10 Merge branch 'sprint/187_tianshujie_fixbug' into 'master'
* Finish task #50303.

See merge request easycorp/zentaopms!2142
2022-03-08 05:22:20 +00:00
zhujinyong ec019ab0ab Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-08 13:16:19 +08:00
zhujinyong 89aaefc8c6 * Fix upgrade. 2022-03-08 13:15:47 +08:00
王怡栋 34e744bb23 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-08 13:03:51 +08:00
王怡栋 72d89e3c9f * adjust for buildIndex menu. 2022-03-08 13:03:34 +08:00
tianshujie 03390a6900 * Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303. 2022-03-08 13:01:53 +08:00
tianshujie 01d35645e6 * Modify the upgrade error report. 2022-03-08 11:17:10 +08:00
孙广明 7c33a75b31 * Add from version. 2022-03-08 11:10:17 +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
孙广明 f898e8c305 Merge branch 'sprint/187_liumengyi_moveCustomFiles' into 'master'
* Fix bug #50341.

See merge request easycorp/zentaopms!2131
2022-03-08 02:09:20 +00:00
朱金勇 8206e65301 Merge branch 'sgm_upgrade' into 'master'
* Fix upgrade error.

See merge request easycorp/zentaopms!2130
2022-03-08 02:09:00 +00:00
liumengyi 084d882f9b * Fix bug #50341. 2022-03-08 10:07:42 +08:00
孙广明 6155c3ed21 Merge branch 'sprint/187_tianshujie_fixbug' into 'master'
Sprint/187 tianshujie fixbug

See merge request easycorp/zentaopms!2127
2022-03-08 01:58:50 +00:00