Commit Graph
50082 Commits
Author SHA1 Message Date
caoyanyi 3090e4fbba * Update test case for isclickable. 2023-01-05 14:19:38 +08:00
caoyanyi f60e62d0c4 Merge branch 'sprint/tsj_uinttest' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tsj_uinttest 2023-01-05 14:08:56 +08:00
caoyanyi 4ecf205024 * Update test case for program settreepath. 2023-01-05 14:07:45 +08:00
田淑杰 71c7124fd7 * Add case for program model. 2023-01-05 13:59:55 +08:00
caoyanyi 592aeee6cd * Modify program udpdate test case. 2023-01-05 13:11:39 +08:00
田淑杰 6e02dc58ea * Add test of program model. 2023-01-05 11:30:15 +08:00
田淑杰 682d97e9f5 * Add test of program model. 2023-01-05 11:20:15 +08:00
caoyanyi 21c5ddefcc * Modify program create test case. 2023-01-05 11:10:04 +08:00
tianshujie edb17bfdc7 * Add test of program model. 2023-01-05 10:44:51 +08: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
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
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
田淑杰 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
孙广明 fb56b7377c Merge branch 'sprint/282_liumengyi_screencover' into 'master'
* Add the cover of screen 6.

See merge request easycorp/zentaopms!6681
2023-01-04 06:34:26 +00: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
田淑杰 daa7c5232b * Remove useless yaml calls. 2023-01-04 14:33:22 +08:00
xieqiyu 99ee8a6b3f * Fix bug of search. 2023-01-04 14:28:47 +08:00
liumengyi 7b243aba8e * Add the cover of screen 6. 2023-01-04 14:15:56 +08:00
liumengyi 93306623f1 * Add the cover of screen 6. 2023-01-04 14:13:11 +08:00
孙广明 2557d6c950 Merge branch 'sprint/tsj_fixbug' into 'master'
* Add upgrade delete file configuration.

See merge request easycorp/zentaopms!6680
2023-01-04 06:11:12 +00: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
田淑杰 eadf56c701 * Compatible with PHP version. 2023-01-04 11:11:48 +08:00
wangyidong 9d013b80c5 * fix bug for compute weekly. 2023-01-04 10:28:52 +08:00