Commit Graph
2668 Commits
Author SHA1 Message Date
tianshujie cc5e5d3c1d * Fix bug #28192. 2022-09-29 18:06:12 +08: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
曹延义 feb98f882c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/cyy_bug 2022-09-29 09:16:40 +08:00
曹延义 94df83c6a1 * Add js comment. 2022-09-29 09:13:07 +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
曹延义 d231cad850 * Modify batch edit style. 2022-09-28 14:32:19 +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
tianshujie 3979c28fb2 * Finish task #70487. 2022-09-28 11:05:50 +08: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
曹延义 46474331ba * Modify batch edit style for product list page. 2022-09-28 11:00:45 +08: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
曹延义 f133837589 * Hide left border. 2022-09-27 15:52:11 +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
李玉春 c53809e799 Merge branch 'sprint/241_tianshujie_68934' into 'master'
* Finish task #68934.

See merge request easycorp/zentaopms!5449
2022-09-21 05:13:34 +00:00
李玉春 a30f398bc2 Merge branch 'sprint/241_tianshujie_fixbug' into 'master'
* Fix bug #27503.

See merge request easycorp/zentaopms!5442
2022-09-21 05:12:42 +00:00
tianshujie 23f5c939ae * Finish task #68934. 2022-09-21 10:10:14 +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
tianshujie 6f9364520e * Fix bug #27503. 2022-09-19 09:21:09 +08: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 5b04709721 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/238_wangzemei_68935 2022-09-15 06:11:28 +00:00
wangzemei f25ff4605b * Finish #68935 2022-09-15 06:10:54 +00:00
李玉春 38e07b27af Merge branch 'sprint/238' into 'master'
Sprint/238

See merge request easycorp/zentaopms!5347
2022-09-15 06:00:45 +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
tianshujie 73f3a6d80a * Finish task #68925. 2022-09-13 16:53:52 +08:00
xieqiyu 638586bea2 * Fix bug#27445. 2022-09-09 16:44:09 +08:00
xieqiyu 981aaf5755 * Fix bug#26874. 2022-09-09 11:24:04 +08:00
liumengyi 79ac6a6ecf * Fix bug #25904. 2022-09-07 16:56:12 +08:00
王怡栋 11f225dfb0 Merge branch 'master_liuhong_66461' into 'master'
*Fix bug #66461.

See merge request easycorp/zentaopms!5180
2022-08-30 00:31:45 +00:00
liuhong 806dddb5e0 *Fix bug #66461. 2022-08-30 00:30:00 +00:00