Commit Graph
103167 Commits
Author SHA1 Message Date
wangyuting 1a402cd288 * [task#145922,done,2h,0h] Finish edit product workflowgroup. 2025-07-15 09:22:47 +08:00
wangyuting 83231344c8 * [task#145922,done,0.1h,0h] Optimize type and status field style. 2025-07-15 09:22:25 +08:00
刘刚 d5754d40c0 Merge branch release/21.7.3 of zentao/zentaopms (#10363) 2025-07-15 08:39:13 +08:00
刘刚 e9e78d8118 Merge branch dev/bug-64005 of zentao/zentaopms (#10365) 2025-07-15 08:37:48 +08:00
刘刚 0dd7049b17 Merge branch dev/bug-64003 of zentao/zentaopms (#10364) 2025-07-15 08:37:41 +08:00
刘刚 aa632ad4c5 Merge branch dev/bug-64003 of zentao/zentaopms (#10361) 2025-07-15 08:36:42 +08:00
liugang 0102b8028b * [perf] Specify index to improve query performance when associated with product. 2025-07-15 08:36:11 +08:00
李阳 25c832bbc2 Merge branch release/21.7.3 of zentao/zentaopms (#10362) 2025-07-15 08:34:09 +08:00
huairong 3b647e6292 + [task#146228,done,0.1h] Modify code. 2025-07-15 08:32:36 +08:00
wangyuting 24f21ca529 * [bug#64003,done,0.1h,0h] Optimize code. 2025-07-14 17:17:56 +08:00
wangyuting 604a47a7e5 * [bug#64003,done,3h,0h] Fix sort testcase error. 2025-07-14 16:50:47 +08:00
李阳 feb5d9636c Merge branch release/21.7.3 of zentao/zentaopms (#10355) 2025-07-14 16:16:36 +08:00
李阳 10030c2496 Merge branch release/21.7.3 of zentao/zentaopms (#10356) 2025-07-14 16:16:19 +08:00
李阳 85e98973ae Merge branch release/21.7.3 of zentao/zentaopms (#10357) 2025-07-14 16:16:07 +08:00
刘刚 f5aa60f4f3 Merge branch dev/bug-64005 of zentao/zentaopms (#10359) 2025-07-14 15:56:58 +08:00
刘刚 94f5cf69fa Merge branch release/21.7.3 of zentao/zentaopms (#10358) 2025-07-14 15:56:47 +08:00
wangyuting 16b51cbb9b * [bug#64005,done,0.2h,0h] Fix icon error. 2025-07-14 13:46:18 +08:00
tianshujie bc85851fa7 * [unittest] fix buildscenebaseoncase error. 2025-07-14 10:58:56 +08:00
yulujie 6ff7f6bd8a *[uitest] Modify data. 2025-07-14 09:04:10 +08:00
huairong 41c154e057 + [task#146228,doing,0.1h,0.1h] Modify code. 2025-07-14 08:44:04 +08:00
huairong 05173e5c0a + [task#146228,doing,0.1h,0.1h] Modify code. 2025-07-14 08:43:38 +08:00
lixiaoyu f229e3fcb2 *[task#146146,doing,0.1h,3h] modify code 2025-07-14 08:37:17 +08:00
刘刚 b6b74b3097 Merge branch dev/bug-63997 of zentao/zentaopms (#10354) 2025-07-11 15:36:02 +08:00
刘刚 d8c748cc23 Merge branch feature/php8.4 of zentao/zentaopms (#10353) 2025-07-11 15:30:28 +08:00
刘刚 d86abb9b3b Merge branch dev/bug-63997 of zentao/zentaopms (#10352) 2025-07-11 15:30:19 +08:00
zhujinyong d2fe4f7a3e * [misc] compatibility with PHP8.4 2025-07-11 15:02:07 +08:00
tianshujie 1ff6e32a22 * [bug#63997,done,0.3h] fix search error under the track page. 2025-07-11 14:55:48 +08:00
刘刚 363e398c0c Merge branch feature/php8.4 of zentao/zentaopms (#10351) 2025-07-11 14:42:03 +08:00
zhujinyong 996b25251e * [misc] compatibility with PHP8.4 2025-07-11 14:37:42 +08:00
刘刚 d2441f7644 Merge branch dev/bug-61139 of zentao/zentaopms (#10350) 2025-07-11 13:57:50 +08:00
刘刚 b8ee017208 Merge branch dev/bug-61139 of zentao/zentaopms (#10348) 2025-07-11 13:57:14 +08:00
刘刚 843ba6ec27 Merge branch dev/task-146436 of zentao/zentaopms (#10347) 2025-07-11 13:57:00 +08:00
刘刚 d08457698b Merge branch release/21.7.3 of zentao/zentaopms (#10349) 2025-07-11 13:52:11 +08:00
liugang ae304c6487 * [bug#63992] check privilege before display the browseScene tag. 2025-07-11 13:49:47 +08:00
tianshujie c431feaf43 * [bug#61139,done,0.5h] fix story language error. 2025-07-11 13:30:17 +08:00
刘刚 66ea5d1ce8 Merge branch dev/task-146436 of zentao/zentaopms (#10345) 2025-07-11 13:24:32 +08:00
daitingting 1f7a839673 * [task#146436,done,2h] Set attribute value. 2025-07-11 11:04:38 +08:00
刘刚 a428f6cfce Merge branch release/21.7.3 of zentao/zentaopms (#10343) 2025-07-11 10:24:27 +08:00
liugang 8edc79599c * [refac] modify redirect url after create a scene. 2025-07-11 10:23:44 +08:00
liugang cf6ea1f5f1 - [refac] remove scene tag in browseScene page. 2025-07-11 10:23:44 +08:00
liugang aa2342cfd0 * [refac] display scene tag for all scenes in browse page. 2025-07-11 10:23:44 +08:00
liugang 1e0915781f - [refac] remove unused code. 2025-07-11 10:23:43 +08:00
李阳 5e189788d3 Merge branch release/21.7.3 of zentao/zentaopms (#10342) 2025-07-11 10:20:03 +08:00
lixiaoyu 99979f29db modify uitest of batchcreateinlite 2025-07-11 10:15:23 +08:00
lixiaoyu 4342433ad6 modify uitest 2025-07-11 10:15:23 +08:00
刘刚 5e67414f74 Merge branch release/21.7.3 of zentao/zentaopms (#10338) 2025-07-11 09:19:49 +08:00
liugang 0e72aee19a + [refac] Restore accidentally deleted code. 2025-07-11 09:19:17 +08:00
李阳 b069fde33c Merge branch release/21.7.3 of zentao/zentaopms (#10336) 2025-07-11 09:18:09 +08:00
李阳 9ab370d275 Merge branch release/21.7.3 of zentao/zentaopms (#10337) 2025-07-11 09:18:01 +08:00
刘刚 e0df9b1d28 Merge branch feature/scene of zentao/zentaopms (#10335) 2025-07-11 09:14:49 +08:00