Commit Graph
41202 Commits
Author SHA1 Message Date
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
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
wangzemei cb9c179d24 * fix bug 28228 2023-01-05 10:25:09 +08: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
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
孙广明 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
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
田淑杰 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
田淑杰 289005c41a * Fix bug #31439. 2023-01-04 15:11:54 +08:00
caoyanyi 64f2c5f0be * Fix bug #31430. 2023-01-04 15:11:15 +08:00
孙广明 7a65ef1358 Merge branch 'zenops_46' into 'master'
Merge branch 'zenops_46'  into master

See merge request easycorp/zentaopms!6678
2023-01-04 06:34:17 +00:00
孙广明 aead5a6372 Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug of search.

See merge request easycorp/zentaopms!6682
2023-01-04 06:33:55 +00:00
xieqiyu 99ee8a6b3f * Fix bug of search. 2023-01-04 14:28:47 +08:00
tianshujie 5eeb79f0cf * Add upgrade delete file configuration. 2023-01-04 14:00:23 +08:00
tanghucheng b56690bd77 * Fix bug #31424. 2023-01-04 13:45:00 +08:00
wangyidong 2f03f91cf4 * adjust code. 2023-01-04 13:31:58 +08:00
tanghucheng 0c526f942f * Change image list icon. 2023-01-04 12:46:05 +08:00
tanghucheng 93b2d7aa07 * Fix bug #31216. 2023-01-04 12:39:41 +08:00
tanghucheng 992c28684d * Fix bug #31412. 2023-01-04 12:16:33 +08:00
wangyidong 9d013b80c5 * fix bug for compute weekly. 2023-01-04 10:28:52 +08:00
王怡栋 5eb1b82ea0 Merge branch 'cyy_bug' into 'master'
* Fix bug #31381.

See merge request easycorp/zentaopms!6675
2023-01-04 02:21:36 +00:00
caoyanyi b72143a535 * Modify cookie set. 2023-01-04 10:20:25 +08:00
caoyanyi cd17b6d3b2 * Adjust code. 2023-01-04 10:12:22 +08:00
王怡栋 0914d265f7 Merge branch 'sprint/wangzemei/kanban' into 'master'
* fix kanban css

See merge request easycorp/zentaopms!6673
2023-01-04 02:09:10 +00:00
zhaoke 5a49e1e579 * Fix bug 31329. 2023-01-04 01:47:37 +00:00
caoyanyi 8ac4dc8fd4 Merge branch 'master' into cyy_bug 2023-01-04 09:34:04 +08:00
caoyanyi c853331163 * Modify admin user check. 2023-01-04 09:33:08 +08:00
zhaoke 81a1bbe039 * Fix bug 31405. 2023-01-04 01:14:29 +00:00