Commit Graph
52473 Commits
Author SHA1 Message Date
Yagami 68becc48cd Merge branch 'zentaoipd' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-03-31 08:59:43 +08:00
Yagami 93b14b8f1e * Add activate product. 2023-03-31 08:59:29 +08:00
tanghucheng 16c2dadb63 * Move the ipd correlation to zentaoext. 2023-03-30 13:17:43 +08:00
tanghucheng a2ee0edb63 * Code for task #89239. 2023-03-30 11:11:41 +08:00
tanghucheng 60f917c933 * Finish task #89242. 2023-03-30 10:20:44 +08:00
Yagami 563d612b21 Merge branch 'zentaoipd' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-03-29 16:47:56 +08:00
Yagami 38b1c0f417 * Fix bug #33474. 2023-03-29 16:47:39 +08:00
tanghucheng 10193e1e15 Merge branch 'zentaoipd' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-03-29 15:45:04 +08:00
tanghucheng b5d99d0ee1 * Fix bug #33485. 2023-03-29 15:44:49 +08:00
Yagami 6041f625df * Fix bug #33466. 2023-03-29 14:27:27 +08:00
Yagami 3c27910cf3 * Add menu alias. 2023-03-29 11:05:44 +08:00
Yagami 6d823f26aa Merge branch 'zentaoipd' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-03-29 09:52:30 +08:00
Yagami 5563f06aa3 * Product's reviewer and PMT can view it. 2023-03-29 09:51:41 +08:00
tanghucheng 9d349da376 * Fix bug #33435. 2023-03-29 08:56:19 +08:00
Yagami 8c4a7525f2 * Unset product menu in ipd page. 2023-03-28 15:46:43 +08:00
Yagami 19f4ce44f3 Merge branch 'zentaoipd' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-03-28 08:48:49 +08:00
Yagami 6a1540aba3 * Create product add vision. 2023-03-28 08:48:20 +08:00
tanghucheng 0d1a22ad71 * Finish task #87224. 2023-03-27 15:25:00 +08:00
Yagami b6445955f0 * Finish task #88401. 2023-03-24 08:59:34 +08:00
Yagami 8deeb9c1fe * Hide demand menu. 2023-03-23 13:19:25 +08:00
Yagami 35614d6bfc * Finish task #88396. 2023-03-22 17:08:02 +08:00
Yagami 4575d65453 * Finish task #88377. 2023-03-22 16:39:19 +08:00
tanghucheng 5b67b730c8 * code for demend browse. 2023-03-22 15:01:09 +08:00
tanghucheng 6a4189996a * Fix bug #33161. 2023-03-21 15:50:51 +08:00
Yagami 5a7c8c73cc Merge branch 'zentaoipd' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-03-16 10:22:33 +08:00
Yagami d84f35b5c8 * Finish task #87151. 2023-03-16 10:22:15 +08:00
tanghucheng 3cf4954c2c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-03-16 10:19:13 +08:00
wangyidong 103ef2810c * fix bug #32990. 2023-03-16 10:10:31 +08:00
wangyidong 4bcac4593a * fix bug #32988. 2023-03-16 10:05:37 +08:00
wangyidong 3c19d401a7 * adjust for save editor. 2023-03-15 17:26:22 +08:00
wangyidong 21ef127eea * fix bug #32975. 2023-03-15 17:23:10 +08:00
王怡栋 fd5788438a Merge branch 'tsj_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!7201
2023-03-15 09:20:39 +00:00
王怡栋 ee930f4cd9 Merge branch 'bugfix/32945_liumengyi' into 'master'
* Fix bug #32945.

See merge request easycorp/zentaopms!7200
2023-03-15 09:15:58 +00:00
王怡栋 1eca83bbb9 Merge branch 'bugfix/32640_liumengyi' into 'master'
* Fix bug #32640, #32618, #32465.

See merge request easycorp/zentaopms!7197
2023-03-15 09:15:43 +00:00
王怡栋 1cc835e08f Merge branch 'sprint/scx_dropdimension' into 'master'
Sprint/scx dropdimension

See merge request easycorp/zentaopms!7202
2023-03-15 09:12:30 +00:00
宋辰轩 180c02755f * Remove sql to 18-2. 2023-03-15 17:07:51 +08:00
宋辰轩 1e882e4a9c * Remove sql to 18-3. 2023-03-15 17:02:16 +08:00
宋辰轩 da0fd20ff3 * Drop dimension. 2023-03-15 17:00:36 +08:00
Yagami 30a136476e * Add demandpool menu. 2023-03-15 16:59:39 +08:00
liumengyi f643f3bd93 * Fix bug #32945. 2023-03-15 08:44:01 +00:00
管西迎 6ff175d2f4 Merge branch 'sprint/hufangzhou_delete_dimension' into 'master'
-  Remove the unused table.

See merge request easycorp/zentaopms!7199
2023-03-15 08:43:59 +00:00
wangyidong 990a5c35bd * fix bug. 2023-03-15 16:38:48 +08:00
tianshujie 42bbd47348 Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-15 16:20:59 +08:00
tianshujie fd18f8b1d1 * Fix bug 32972. 2023-03-15 16:20:05 +08:00
caoyanyi 03be35acd9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-15 16:12:40 +08:00
tianshujie e68579843f * Fix bug 32965. 2023-03-15 15:55:49 +08:00
hufangzhou 5b033e8f42 * Remove the unused table. 2023-03-15 15:53:52 +08:00
tianshujie a051e5b3ff Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-15 15:41:11 +08:00
tianshujie a30fed01fa * Fix bug 32942. 2023-03-15 15:40:57 +08:00
王怡栋 bb6a06042b Merge branch 'dev/gfl_fix_bug' into 'master'
* Adjust code for func saveFormDraft .

See merge request easycorp/zentaopms!7198
2023-03-15 07:37:52 +00:00