Commit Graph
48321 Commits
Author SHA1 Message Date
wangyuting a4cc3fd11a * Fix bug #30265. 2022-11-25 03:25:52 +00: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
王怡栋 ac67576a3a Merge branch 'zentaopms_263_bug_#30209' into 'master'
* Fix bug #30209.

See merge request easycorp/zentaopms!6364
2022-11-24 06:48:36 +00:00
王怡栋 3d00d28310 Merge branch 'zentaopms_263_bug#30132' into 'master'
* Fix bug #30132.

See merge request easycorp/zentaopms!6363
2022-11-24 06:47:55 +00:00
王怡栋 818bdf7a92 Merge branch 'zentaopms_263_bug#30130' into 'master'
* Fix bug #30130.

See merge request easycorp/zentaopms!6361
2022-11-24 06:43:30 +00:00
王怡栋 e61f5eb9c0 Merge branch 'master_xieqiyu_30105' into 'master'
* Fix bug#30105.

See merge request easycorp/zentaopms!6360
2022-11-24 06:43:14 +00:00
wangjianhua fc9bada77c * Fix comments. 2022-11-24 14:42:01 +08:00
liuhong c0852057c5 * Adjust code. 2022-11-24 06:38:23 +00:00
liuhong 2204d0e30c * Adjust code #30172. 2022-11-24 06:34:11 +00:00
xieqiyu 4813aea7b3 * Fix bug#30214. 2022-11-24 14:31:10 +08:00
lanzongjun 675891f136 * Fix Bug #30028 2022-11-24 14:26:27 +08:00
liuhong b928b40f02 * Adjust code.. 2022-11-24 06:25:19 +00:00
daitingting df38b1400c * Fix bug #30209. 2022-11-24 06:20:49 +00:00
liuhong c91024ecf3 * Fix bug #30172 #30178. 2022-11-24 06:19:48 +00:00
wangyuting cf769403ea * Fix bug #30132. 2022-11-24 06:17:14 +00:00
daitingting f62090ea37 * Fix bug #30076. 2022-11-24 05:56:25 +00:00
Yagami f881d7951e * Fix bug #30017. 2022-11-24 13:46:14 +08:00
wangyuting 9cbbc919f6 * Fix bug #30130. 2022-11-24 05:45:13 +00:00
xieqiyu a640d56e39 * Fix bug#30105. 2022-11-24 13:37:35 +08:00
孙广明 55a42af328 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix Bug #30180

See merge request easycorp/zentaopms!6359
2022-11-24 05:29:31 +00:00
lanzongjun f47d9fcb18 * Fix Bug #30180 2022-11-24 13:19:02 +08:00