Commit Graph
50100 Commits
Author SHA1 Message Date
tanghucheng f7fc0c8738 Merge branch 'zenops_46' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46 2023-01-06 15:28:28 +08:00
zhaoke 7314399cad * Remove test code. 2023-01-06 05:24:43 +00:00
zhaoke ebec1436c7 * Open manual page in new window. 2023-01-06 05:06:14 +00:00
zhaoke ae211ba53b * Fix success tips not show. 2023-01-06 03:36:58 +00:00
tanghucheng 83e8ebf65b * Fix bug #31437. 2023-01-05 13:15:59 +08:00
tanghucheng bd2bdbefe4 * Fix bug #31454. 2023-01-05 12:29:49 +08:00
tanghucheng 69cd509235 Merge branch 'master' into zenops_46 2023-01-05 12:23:45 +08:00
tanghucheng 5c2a41cdef * Fix bug #31361. 2023-01-05 12:22:00 +08:00
tanghucheng 24e343dbc3 * Fix bug #31473. 2023-01-05 12:13:22 +08:00
tanghucheng 2f372f2e6a * Fix bug #31475. 2023-01-05 11:15:44 +08:00
王怡栋 c9f961b573 Merge branch 'sprint/wangzemei/28228' into 'master'
* Fix bug 28228

See merge request easycorp/zentaopms!6694
2023-01-05 03:10:56 +00:00
wangzemei 41b26bec7d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/wangzemei/28228 2023-01-05 11:06:21 +08:00
wangzemei 3ffad7f44a * Fix bug 28228 2023-01-05 11:03:29 +08:00
王怡栋 de8493412a Merge branch 'cyy_bug' into 'master'
* Modify job edit error tip.

See merge request easycorp/zentaopms!6689
2023-01-05 02:55:34 +00:00
王怡栋 a721827b0a Merge branch 'sprint/hufangzhou_bug_31444' into 'master'
* Fix bug #31444.

See merge request easycorp/zentaopms!6687
2023-01-05 02:55:18 +00:00
孙广明 7c7a95ccaa * Code for api db. 2023-01-05 10:43:28 +08:00
wangzemei cb9c179d24 * fix bug 28228 2023-01-05 10:25:09 +08:00
孙广明 b803449d48 Merge branch 'sprint/tsj_fixbug' into 'master'
* Fix bug #31470.

See merge request easycorp/zentaopms!6692
2023-01-05 02:14:43 +00:00
田淑杰 5ecaa57043 * Fix bug #31470. 2023-01-05 10:13:34 +08:00
caoyanyi 459f1ae27d * Fix bug #31469. 2023-01-05 09:58:49 +08:00
孙广明 905b5965f6 Merge branch 'zenops_46' into 'master'
* Fix bug #31451.

See merge request easycorp/zentaopms!6690
2023-01-05 01:46:10 +00:00
孙广明 97b61a90aa Merge branch 'sprint/tsj_uinttest' into 'master'
Sprint/tsj uinttest

See merge request easycorp/zentaopms!6691
2023-01-05 01:46:02 +00:00
tianshujie e3654d8d2b * Add test of program model. 2023-01-05 09:35:24 +08:00
caoyanyi fae96c6983 * Update yaml class. 2023-01-05 09:34:00 +08:00
tanghucheng f507efaa7d * Fix bug #31446. 2023-01-05 09:15:58 +08:00
tanghucheng c168347487 * Fix issue. 2023-01-05 09:10:29 +08:00
tanghucheng 79a7989421 * Fix bug #31451. 2023-01-05 09:01:03 +08:00
caoyanyi a29dc70a21 * Modify job edit error tip. 2023-01-05 08:44:04 +08:00
caoyanyi d2f410e74b Merge branch 'sprint/tsj_uinttest' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tsj_uinttest 2023-01-05 08:41:19 +08:00
caoyanyi 67a9ee4edf * Update test case. 2023-01-05 08:40:57 +08:00
田淑杰 b33d1dd9f5 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tsj_uinttest 2023-01-04 20:23:57 +08:00
孙广明 a380757b42 Merge branch 'cyy_bug' into 'master'
* Modify vision switch.

See merge request easycorp/zentaopms!6685
2023-01-04 09:24:19 +00:00
孙广明 2494eb0b63 Merge branch 'zenops_46' into 'master'
* Fix bug #31322.

See merge request easycorp/zentaopms!6688
2023-01-04 09:24:11 +00:00
tanghucheng a85663d8dc * Change icon for zanode resume. 2023-01-04 17:20:14 +08:00
tanghucheng 9a2d95c536 * Fix bug #bug #31449. 2023-01-04 17:11:54 +08:00
tanghucheng 7277779b02 * Fix bug #31445. 2023-01-04 17:07:52 +08:00
tanghucheng 10694147f6 * Fix bug #31359. 2023-01-04 16:59:40 +08:00
hufangzhou df9a7a806a * Fix bug #31444. 2023-01-04 08:44:56 +00:00
Yagami ed3e779cd8 * Rewrite api. 2023-01-04 16:16:50 +08:00
田淑杰 0694ab3c78 Merge branch 'sprint/tsj_uinttest' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tsj_uinttest 2023-01-04 16:08:44 +08:00
田淑杰 e666d10771 * Add getByID method for program module. 2023-01-04 16:08:15 +08:00
Yagami 94e5990cbb * Fix api module file. 2023-01-04 16:07:14 +08:00
caoyanyi 5a31dfcbe9 * Update version. 2023-01-04 15:46:09 +08:00
tanghucheng 28eec1c4c3 * Fix bug #31322. 2023-01-04 15:29:05 +08:00
caoyanyi b758139f9b * Modify vision switch. 2023-01-04 15:27:10 +08:00
孙广明 417f56c09d Merge branch 'cyy_bug' into 'master'
Cyy bug

See merge request easycorp/zentaopms!6684
2023-01-04 07:26:21 +00:00
孙广明 42ac91d2de Merge branch 'sprint/tsj_fixbug' into 'master'
* Fix bug #31439.

See merge request easycorp/zentaopms!6683
2023-01-04 07:25:01 +00:00
田淑杰 624ac45620 * Fix bug #31439. 2023-01-04 15:20:35 +08:00
caoyanyi 4a75eb6ee2 * Adjust code. 2023-01-04 15:14:41 +08:00
caoyanyi 6ba888ea77 * Modify sonarqube memory limit. 2023-01-04 15:12:30 +08:00