Commit Graph
149 Commits
Author SHA1 Message Date
zhujinyong dd05466ab9 * Fix bug#38929. 2023-09-25 16:07:58 +08:00
tanghucheng 6b0db86d24 Merge branch '18.x' into zentaoipd 2023-07-13 17:26:49 +08:00
songchenxuan c94f65442c * Fix bug #36142 again. 2023-07-07 09:41:02 +08:00
tanghucheng 56652023ab Merge branch '18.x' into zentaoipd 2023-07-04 13:54:28 +08:00
songchenxuan 83223d1b27 * Fix bug #36142. 2023-07-04 09:53:27 +08:00
tanghucheng 3741c9b6fa Merge branch '18.x' into zentaoipd 2023-07-03 13:36:29 +08:00
zhujinyong 2f9ca0e6d6 * Performance for product list. 2023-06-12 16:30:09 +08:00
Yagami 434aed0830 Merge branch '18.4' into zentaoipd 2023-05-19 14:47:42 +08:00
songchenxuan 2a05766fe2 * Fix bug #31321, modify product story completion rate. 2023-05-16 10:10:58 +08:00
Yagami bc44a293ef * Add PLM to judgement. 2023-05-05 10:24:12 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
宋辰轩 0ae429c5ad * Finish story 41069,41070. 2022-12-26 15:10:10 +08:00
xieqiyu 95b35e03a2 * Fix bug#30050. 2022-11-22 13:21:38 +08:00
王怡栋 52c59a98e0 * fix bug #30005. 2022-11-22 09:01:12 +08:00
wangyuting b441fd0a4c * Fix bug #29840. 2022-11-16 01:13:08 +00:00
daitingting cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
guofeilong 4bbf5fa371 * fix bug #28333 2022-10-11 08:54:36 +00:00
guofeilong 11bf0dc557 * fix bug *28333 2022-10-11 02:54:35 +00:00
曹延义 6b59d194fb * Optimize product page. 2022-10-09 15:38:30 +08:00
dingyongliang 61a485590e * change nest toggle position. 2022-09-30 08:05:04 +00:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
曹延义 e363bb4ef9 Merge branch 'sprint/244' into sprint/244_wangzemei_70009 2022-09-28 15:19:58 +08:00
李玉春 f6b6bbd5e7 Merge branch 'sprint/cyy_bug' into 'sprint/244'
Sprint/cyy bug

See merge request easycorp/zentaopms!5575
2022-09-28 03:12:07 +00:00
李玉春 1868918ad8 Merge branch 'sprint/244_dyl_70501' into 'sprint/244'
* rm product icon.

See merge request easycorp/zentaopms!5568
2022-09-28 03:03:22 +00:00
tianshujie 43a95b18e2 * Finish task #70487,70492. 2022-09-28 10:45:23 +08:00
tianshujie 4f8bc6a9ad * Finish task #70489,70488. 2022-09-28 10:06:55 +08:00
wangyidong 4d9856be14 * code for task #70540. 2022-09-28 09:25:52 +08:00
曹延义 d16362e3da * Set batch edit checkbox style to cookie. 2022-09-28 08:58:30 +08:00
曹延义 5bb453c851 * Code for task #70489. 2022-09-27 16:00:13 +08:00
曹延义 c9f757c635 * Adjust code. 2022-09-27 13:23:37 +08:00
曹延义 30973efa6a * Modify language. 2022-09-27 08:31:42 +08:00
曹延义 f23e60374f * Code for task #70490. 2022-09-26 14:01:25 +08:00
dingyongliang f60dc0e7be * rm product icon. 2022-09-26 05:50:47 +00:00
曹延义 288fcede9d * Code for task #70485. 2022-09-26 11:48:27 +08:00
xieqiyu 6e531700ee * Finish task#60722. 2022-08-23 16:56:58 +08:00
xieqiyu 8c2e982023 * Fix bug of product list page. 2022-08-16 09:07:45 +08:00
xieqiyu 17773dee90 * Code for story of add draft status. 2022-08-12 16:00:00 +08:00
zenggang a9fc847711 * Adjust code 2022-08-05 06:37:45 +00:00
wangyuting2 84c6278274 * Finish task #63288. 2022-08-03 13:32:41 +08:00
zhouxudong bc16e41c73 * Fix bug #24472. 2022-06-30 02:44:29 +00:00
孙广明 b9f3120c8b * Fix bug #24508. 2022-06-29 13:29:03 +08:00
zhouxudong 14766c32f6 * Finish task #57860. 2022-06-27 00:39:37 +00:00
孙广明 1ca935f2b4 Merge branch 'sgm_fixbug' into 'master'
* Change product browse order btn.

See merge request easycorp/zentaopms!3987
2022-06-16 08:53:44 +00:00
孙广明 5af03f4cf6 * Change product browse order btn. 2022-06-16 16:52:08 +08:00
sunjun d0dfc61e48 sprint_57091 2022-06-15 14:25:01 +00:00
sunjun b039a66450 57091 2022-06-15 09:06:55 +00:00
sunjun 43e78a280e sprint_204_57091 2022-06-15 08:09:52 +00:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00