 wangyidong
|
9761648d59
|
Merge branch 'zentaopms_239'
|
2022-11-08 08:41:28 +08:00 |
|
|
wangzemei
|
261eb124ae
|
* fix bug 29345
|
2022-11-07 13:51:53 +08:00 |
|
|
liuhong
|
db86c8456d
|
* Fix bug #28884.
|
2022-10-28 02:33:59 +00:00 |
|
|
wangyidong
|
148d3d6d6b
|
Merge branch 'master' into zentaopms_239
|
2022-10-27 11:39:47 +08:00 |
|
|
tianshujie
|
a72173cd72
|
* Finish task #73752.
|
2022-10-26 15:49:13 +08:00 |
|
|
tianshujie
|
935faa00bd
|
* Finish task #73752.
|
2022-10-26 14:01:04 +08:00 |
|
|
tianshujie
|
308a8b9f5e
|
* Finish task #73750.
|
2022-10-26 13:15:38 +08:00 |
|
|
wangyidong
|
585b12838e
|
* code for task #73472.
|
2022-10-25 14:04:12 +08:00 |
|
|
wangzemei
|
84f1b64aae
|
* remove useless class
|
2022-10-19 14:35:12 +08:00 |
|
|
wangzemei
|
25f8023fef
|
* Solve width calculation problems
|
2022-10-19 14:31:55 +08:00 |
|
|
wangzemei
|
68f702d9ef
|
* fix 28395 28640 28406
|
2022-10-19 11:07:04 +08:00 |
|
|
lanzongjun
|
aa6546a2ee
|
resolve conflict
|
2022-10-18 09:26:14 +08:00 |
|
|
wangzemei
|
6aad1dacac
|
* Fix the problem that the button is not shown
|
2022-10-14 14:57:17 +08:00 |
|
|
李玉春
|
8624143bcc
|
Merge branch 'cyy_app' into 'master'
* Add user info data return.
See merge request easycorp/zentaopms!5737
|
2022-10-13 00:58:13 +00:00 |
|
|
李玉春
|
3de060e49b
|
Merge branch 'sprint/gfl_28333' into 'master'
Sprint/gfl 28333
See merge request easycorp/zentaopms!5732
|
2022-10-13 00:56:21 +00:00 |
|
|
曹延义
|
4a1cb6551b
|
* Fix bug #28
52.#
|
2022-10-12 15:45:02 +08:00 |
|
|
guofeilong
|
4bbf5fa371
|
* fix bug #28333
|
2022-10-11 08:54:36 +00:00 |
|
|
tianshujie
|
d29c43fef1
|
* Fix bug #28436.
|
2022-10-11 14:29:43 +08:00 |
|
|
guofeilong
|
11bf0dc557
|
* fix bug *28333
|
2022-10-11 02:54:35 +00:00 |
|
|
曹延义
|
f559785539
|
* Optimize page style.
|
2022-10-09 17:08:21 +08: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 |
|
|
lanzongjun
|
2a7b35764f
|
* modify db
|
2022-09-30 10:16:57 +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 |
|
|
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 |
|
|
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 |
|
|
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
|
8e46aa45f5
|
* Fix bug #26832.
|
2022-08-25 09:07:19 +08:00 |
|
|
tianshujie
|
c0e97a501c
|
* Finish task #64976.
|
2022-08-18 14:33:10 +08:00 |
|
|
chaideqing
|
3532e82841
|
* fix card show blank above header
|
2022-07-11 15:29:26 +08:00 |
|
|
王怡栋
|
b3a27bb266
|
Merge branch 'sprint/master_zhouxudong_57860' into 'master'
Sprint/master zhouxudong 57860
See merge request easycorp/zentaopms!4189
|
2022-06-28 07:05:57 +00:00 |
|
|
zhouxudong
|
f0d829a16c
|
* FInish task #57860.
|
2022-06-28 03:17:42 +00:00 |
|
|
zhouxudong
|
14766c32f6
|
* Finish task #57860.
|
2022-06-27 00:39:37 +00:00 |
|
|
hufangzhou
|
eebcfaad58
|
* Adjust the spacing of dynamic block and dynamic page.
|
2022-06-24 13:33:11 +08:00 |
|
|
hufangzhou
|
ac69cd1afb
|
* Finish task #57883.
|
2022-06-22 10:39:55 +08:00 |
|
|
hufangzhou
|
adad8ea3ae
|
* Finish task #57882, #57874, #57873, #57855.
|
2022-06-21 17:30:36 +08: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
|
43e78a280e
|
sprint_204_57091
|
2022-06-15 08:09:52 +00:00 |
|
|
hufangzhou
|
1acb25fc6c
|
* Fix bug #17335.
|
2022-04-24 11:02:17 +08:00 |
|
|
zhouxin
|
8ec6de5fb5
|
* Fix bug #2296,#1832.
|
2022-04-21 05:50:05 +00:00 |
|
|
renying
|
d219dac730
|
Fix bug#17274
|
2022-04-14 14:37:10 +08:00 |
|
|
孙华伟
|
80a565aa47
|
*Optimize the code.
|
2022-04-12 11:17:20 +08:00 |
|
|
孙华伟
|
92a01376bb
|
*Fix bug#21488.
|
2022-04-12 10:42:45 +08:00 |
|