Commit Graph
1226 Commits
Author SHA1 Message Date
wangzemei 01a12c95d9 * fix bug #283950 2022-10-11 16:42:59 +08:00
tianshujie 875ac851b4 * Fix bug #28460. 2022-10-11 15:07:12 +08:00
wangzemei 740e144707 * fix bug 28388 && 28395 2022-10-11 14:05:33 +08:00
tianshujie fa4b34d58f * Delete unnecessary Spaces. 2022-10-10 16:39:54 +08:00
tianshujie e6082de4f4 * Finish task #71905. 2022-10-10 14:56:42 +08:00
曹延义 6b59d194fb * Optimize product page. 2022-10-09 15:38:30 +08:00
曹延义 9e7e1f6969 * Finish task #71906. 2022-10-08 17:17:42 +08:00
liyuchun fbb492f4a5 Merge branch 'sprint/244_dyl_70022' 2022-10-08 10:56:08 +08:00
dingyongliang 61a485590e * change nest toggle position. 2022-09-30 08:05:04 +00:00
liuhong 19e848e0fe *Fix bug #28189. 2022-09-30 03:01:14 +00:00
曹延义 05a255653b * Code for bug #28153. 2022-09-29 11:00:37 +08:00
曹延义 885121c725 * Modify classic model style. 2022-09-29 10:27:45 +08:00
李玉春 befe790a5f Merge branch 'sprint/244_tianshujie_70482' into 'sprint/244'
Sprint/244 tianshujie 70482

See merge request easycorp/zentaopms!5600
2022-09-29 01:08:46 +00:00
曹延义 e363bb4ef9 Merge branch 'sprint/244' into sprint/244_wangzemei_70009 2022-09-28 15:19:58 +08:00
tianshujie 51fb885b08 * Finish task #70482. 2022-09-28 15:10:49 +08:00
李玉春 d401ef9626 Merge branch 'sprint/241_tianshujie_70015' into 'sprint/244'
Sprint/241 tianshujie 70015

See merge request easycorp/zentaopms!5577
2022-09-28 03:25:16 +00: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
曹延义 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
tianshujie 92eb14d26e * Finish task #70015. 2022-09-26 16:13:39 +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
tianshujie 0e0d13b0a0 * Finish task #70015. 2022-09-26 10:52:36 +08:00
tianshujie 259abfd8b7 Merge branch 'sprint/244' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/241_tianshujie_70015 2022-09-26 10:48:15 +08:00
wangzemei b77ad0dff7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/238_wangzemei_68933 2022-09-22 13:50:12 +08:00
zenggang 307c4b3a5f * Code for feedback#957 2022-09-21 08:25:09 +00:00
tianshujie 26a21964f8 * Finish task #70015. 2022-09-21 15:02:17 +08:00
王怡栋 e067e74363 Merge branch 'feedback_878' into 'master'
* Code for feedback#878

See merge request easycorp/zentaopms!5316
2022-09-19 05:38:18 +00:00
wangzemei c800691fee * remove class 2022-09-16 05:54:25 +00:00
wangzemei a022039be1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/238_wangzemei_68933 2022-09-16 05:44:42 +00:00
wangzemei 4d9d562128 * merge master 2022-09-16 05:32:16 +00:00
wangzemei d43547072d * Fix bug 27511 2022-09-16 03:21:57 +00:00
wangzemei f25ff4605b * Finish #68935 2022-09-15 06:10:54 +00:00
wangzemei 57d8bc7cfd * modify about task #68933 2022-09-14 08:46:13 +00:00
zenggang a221558803 * Code for feedback#878 2022-09-14 02:35:46 +00:00
xieqiyu 981aaf5755 * Fix bug#26874. 2022-09-09 11:24:04 +08:00
tianshujie 12e8aebfb2 * Fix bug #26946. 2022-08-26 15:18:58 +08:00
tianshujie 6b671ddd1e * Fix bug #26852. 2022-08-26 09:23:05 +08:00
tianshujie 06ab4ea7a5 * Fix bug #26862. 2022-08-25 13:06:38 +08:00
tianshujie cc3ebce871 * Fix bug #26862. 2022-08-25 10:42:34 +08:00
孙广明 41e346a299 Merge branch 'sprint/231_tianshujie_bug' into 'master'
Sprint/231 tianshujie bug

See merge request easycorp/zentaopms!5104
2022-08-25 01:57:26 +00:00
tianshujie 1c1ccb2c6a * Fix bug #26834. 2022-08-25 09:27:57 +08:00
liumengyi de58e793b4 * Fix bug #26841. 2022-08-25 08:39:47 +08:00
xieqiyu 6e531700ee * Finish task#60722. 2022-08-23 16:56:58 +08:00