Commit Graph
48340 Commits
Author SHA1 Message Date
王怡栋 e90baa91f9 Merge branch 'znetaopms_263_bug#30265' into 'master'
* Fix bug #30265.

See merge request easycorp/zentaopms!6381
2022-11-25 05:02:58 +00:00
朱金勇 edcf2491cf Merge branch 'fix/path' into 'master'
* Optimize index and checktable file.

See merge request easycorp/zentaopms!6379
2022-11-25 04:12:57 +00:00
wangyuting a4cc3fd11a * Fix bug #30265. 2022-11-25 03:25:52 +00:00
王怡栋 1391d6b213 Merge branch 'zentaopms_263_bug#30132' into 'master'
* Adjust history data.

See merge request easycorp/zentaopms!6380
2022-11-25 03:10:45 +00:00
王怡栋 860e2eaec8 Merge branch 'zentaopms_263_bug#29566' into 'master'
* Fix bug #29566.

See merge request easycorp/zentaopms!6378
2022-11-25 03:10:02 +00:00
孙广明 1d9b2ce11c Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix Bug #30028#30240#30245

See merge request easycorp/zentaopms!6376
2022-11-25 03:09:48 +00:00
孙广明 7f1533ed40 Merge branch 'master_xieqiyu_30233' into 'master'
* Fix bug#30233.

See merge request easycorp/zentaopms!6377
2022-11-25 03:09:25 +00:00
Yagami 84dce924b8 * Code for task #30261. 2022-11-25 11:07:45 +08:00
Yagami 7fbcb9b13e * Finish task #30261. 2022-11-25 10:50:22 +08:00
lanzongjun edbf6b4307 * Fix Bug #30245 2022-11-25 10:37:19 +08:00
wangyuting b38fb65e19 * Adjust history data. 2022-11-25 02:30:41 +00:00
王怡栋 50998cbe13 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-25 10:10:19 +08:00
王怡栋 2a5333b298 * fix bug #15815. 2022-11-25 10:09:47 +08:00
Lufei 2b85f62b75 * Update check filename. 2022-11-25 10:08:00 +08:00
Lufei 0a8110a3d8 * Jump when the version is different and the upgrade file exists. 2022-11-25 10:07:37 +08:00
Yagami efbbaa9918 * Fix bug. 2022-11-25 09:53:17 +08:00
wangyuting 6a445b8a42 * Fix bug #29566. 2022-11-25 01:48:56 +00:00
lanzongjun 3e2648ab5e * Fix Bug #30240 2022-11-25 09:34:57 +08:00
xieqiyu d00e4f5978 * Fix bug#30233. 2022-11-25 09:06:19 +08:00
lanzongjun 4223c7a7f1 * Fix Bug #30235 2022-11-25 08:49:01 +08:00
王怡栋 11b93eaeed Merge branch 'zentaopms_263_wangyuting5' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!6375
2022-11-25 00:40:15 +00:00
Yagami ebe32d85ef Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-25 08:39:58 +08:00
Yagami 25e5b27220 * Finish task #77365. 2022-11-25 08:39:24 +08:00
wangyuting 40ef984250 * Optimize code. 2022-11-25 00:38:38 +00:00
王怡栋 eb84b76b2c * fix bug. 2022-11-25 08:35:00 +08:00
王怡栋 994015ade9 * fix bug #30229. 2022-11-25 08:34:59 +08:00
孙广明 38e665a485 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix Bug #30028 Task #77265

See merge request easycorp/zentaopms!6365
2022-11-25 00:27:21 +00:00
wangyuting c9615e8ad9 * Optimize code. 2022-11-25 00:26:21 +00:00
王怡栋 ace3fdd623 Merge branch 'zentaopms_263_wangyuting5' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!6374
2022-11-25 00:26:05 +00:00
wangyuting 7417517c05 * Fix bug. 2022-11-24 08:37:31 +00:00
lanzongjun 9e55689058 * Fix Task #77265 2022-11-24 16:23:19 +08:00
孙广明 20ef71754b Merge branch 'sprint/zentaopms262_mayue_bug#30096' into 'master'
* Fix bug #30096.

See merge request easycorp/zentaopms!6373
2022-11-24 08:13:55 +00:00
Yagami 968a7e59ef * Fix isclickable error. 2022-11-24 16:13:08 +08:00
lanzongjun cafe704080 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-11-24 16:12:02 +08:00
mayue fc4abe395d * Fix bug #30096. 2022-11-24 16:10:19 +08:00
王怡栋 6114d5cfbe Merge branch 'zentaopms_263_bug#30216' into 'master'
* Fix bug #30216.

See merge request easycorp/zentaopms!6372
2022-11-24 07:57:14 +00:00
王怡栋 6da55abf9e Merge branch 'zentaopms_263_bug_#30076' into 'master'
* Fix bug #30076.

See merge request easycorp/zentaopms!6362
2022-11-24 07:48:22 +00:00
daitingting 607667bd25 * Adjust codes. 2022-11-24 07:46:53 +00:00
wangyuting 66f84dbd10 * Adjust demo sql sprint to long. 2022-11-24 07:46:34 +00:00
wangyuting 22f2299bfa * Fix bug #30216. 2022-11-24 07:42:49 +00:00
王怡栋 edaa2e3d96 Merge branch 'master_bug' into 'master'
* Fix ticket export error.

See merge request easycorp/zentaopms!6371
2022-11-24 07:42:12 +00:00
王怡栋 4497bdaa28 Merge branch 'master_xieqiyu_30203' into 'master'
* Fix bug#30203.

See merge request easycorp/zentaopms!6370
2022-11-24 07:41:39 +00:00
王怡栋 8b19070f9b Merge branch 'tanghucheng_fixbug' into 'master'
* Adjust code for bug #30011,24060.

See merge request easycorp/zentaopms!6369
2022-11-24 07:40:07 +00:00
liuhong 4576a70768 * Fix ticket export error. 2022-11-24 07:30:38 +00:00
daitingting a6d42f8372 * Check build is integrated. 2022-11-24 06:59:55 +00:00
tanghucheng 3ca705de9f * Adjust code for bug #30011,24060. 2022-11-24 14:58:59 +08:00
xieqiyu 657eb39302 * Fix bug#30203. 2022-11-24 14:52:47 +08:00
王怡栋 3da67c70ee Merge branch 'master_bug_30172' into 'master'
Master bug 30172

See merge request easycorp/zentaopms!6368
2022-11-24 06:51:38 +00:00
王怡栋 58eed1be72 Merge branch 'master_oss_wangjianhua' into 'master'
Modify file module to support OSS plug.

See merge request easycorp/zentaopms!6367
2022-11-24 06:50:16 +00:00
王怡栋 1e4f07c190 Merge branch 'master_xieqiyu_30214' into 'master'
* Fix bug#30214.

See merge request easycorp/zentaopms!6366
2022-11-24 06:49:06 +00:00