Commit Graph
35059 Commits
Author SHA1 Message Date
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
tianshujie 06701aa5a0 * Fix style issues when raising bugs. 2022-03-09 09:34:52 +08:00
tianshujie e1dd273c3c * Modify the add contact popup style. 2022-03-09 08:49:13 +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
zhujinyong 27bd1de1d1 * Fix code error. 2022-03-08 16:22:41 +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
王怡栋 d62013b39f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-08 13:30:35 +08:00
王怡栋 1e8e9d5a45 * code for kanban menu. 2022-03-08 13:28:48 +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
孙广明 e823f2223c Merge branch 'sprint/187_hufangzhou_makefile' into 'master'
* Need not to merge xuanxuan sql.

See merge request easycorp/zentaopms!2141
2022-03-08 03:29:19 +00:00
hufangzhou ee52c0370e * Need not to merge xuanxuan sql. 2022-03-08 11:28:16 +08:00
孙广明 597124d922 Merge branch 'sprint/187_tianshujie_fixbug' into 'master'
* Modify the upgrade error report.

See merge request easycorp/zentaopms!2139
2022-03-08 03:18:31 +00:00
tianshujie 01d35645e6 * Modify the upgrade error report. 2022-03-08 11:17:10 +08:00
朱金勇 ec5dade7d6 Merge branch 'sgm_upgrade' into 'master'
* Add from version.

See merge request easycorp/zentaopms!2138
2022-03-08 03:15:55 +00: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
tianshujie f42695af2c * Modify the default width of the project name. 2022-03-08 09:57:14 +08:00
孙广明 6d14f4019a Merge branch 'sprint/187_liumengyi_moveCustomFiles' into 'master'
* Remove custom modules.

See merge request easycorp/zentaopms!2129
2022-03-08 01:57:01 +00:00
liumengyi a386589929 * Remove custom modules. 2022-03-08 09:54:44 +08:00
Zongjun Lan b82a7e5f57 * fix bug 50368 2022-03-08 09:51:34 +08:00
孙广明 f5f1679073 * Fix upgrade error. 2022-03-08 09:46:29 +08:00
tianshujie 19017161b6 * Delete useless variables. 2022-03-08 09:45:21 +08:00
zhujinyong 445bd93d3e * Check version. 2022-03-08 09:41:38 +08:00
tianshujie 23f8d33293 * Add variable judgment. 2022-03-08 08:59:15 +08:00
zhujinyong 01c96e266c * Format. 2022-03-08 08:58:27 +08:00
朱金勇 48d94bd7af Merge branch 'sgm_db' into 'master'
* Add pro/biz/max sql to open.

See merge request easycorp/zentaopms!2126
2022-03-08 00:58:11 +00:00
孙广明 33fc87131e * Add pro/biz/max sql to open. 2022-03-08 08:55:16 +08:00
tianshujie c2f14bb9c2 * Finish task #50318. 2022-03-08 08:53:55 +08:00
孙广明 f76d93b889 Merge branch 'sprint/187_hufangzhou_20439' into 'master'
* Fix bug #20439.

See merge request easycorp/zentaopms!2125
2022-03-08 00:53:24 +00:00
朱金勇 610f42ca09 Merge branch 'autotest_ly' into 'master'
Add execution model

See merge request easycorp/zentaopms!2090
2022-03-08 00:25:42 +00:00