 王怡栋
|
d6ea8aea86
|
Merge branch 'master_xieqiyu_25004' into 'master'
* Fix bug#25004.
See merge request easycorp/zentaopms!4676
|
2022-07-28 00:52:40 +00:00 |
|
|
xieqiyu
|
0ec68feb10
|
* Fix bug#25004.
|
2022-07-27 21:38:28 +08:00 |
|
|
王怡栋
|
378fb33899
|
Merge branch 'sprint/xuanxuan_112' into 'master'
Sprint/xuanxuan 112
See merge request easycorp/zentaopms!4687
|
2022-07-27 08:59:23 +00:00 |
|
|
xieqiyu
|
22327a069c
|
* Fix bug#25764.
|
2022-07-27 15:22:20 +08:00 |
|
|
xieqiyu
|
cd8247954c
|
* Fix bug#25004.
|
2022-07-27 13:31:48 +08:00 |
|
|
chaideqing
|
3fc3cf64e0
|
* remove zentao card's top-right button
|
2022-07-26 09:12:42 +08:00 |
|
|
zenggang
|
5def4aef24
|
* Finish task#61182,61168
|
2022-07-20 08:28:33 +00:00 |
|
|
王怡栋
|
d349931e82
|
Merge branch 'sprint/217_liumengyi_61171' into 'master'
* Finish task #61171, #61170.
See merge request easycorp/zentaopms!4610
|
2022-07-20 06:23:40 +00:00 |
|
|
liumengyi
|
d73346c395
|
* Finish task #61171, #61170.
|
2022-07-19 15:22:38 +08:00 |
|
|
tianshujie
|
fc58365ce9
|
* Finish task #61179.
|
2022-07-19 13:31:16 +08:00 |
|
|
王怡栋
|
7e682c99c2
|
Merge branch 'sprint/xuanxuan_110' into 'master'
Sprint/xuanxuan 110
See merge request easycorp/zentaopms!4563
|
2022-07-15 03:17:39 +00:00 |
|
|
mayue
|
4226041ae4
|
* Fix bug #25191#25087.
|
2022-07-14 10:15:57 +08:00 |
|
|
zenggang
|
38e996bd18
|
* Fix bug#25222,25232
|
2022-07-14 01:38:00 +00:00 |
|
|
hufangzhou
|
d133a2b5e8
|
* Add the new version.
|
2022-07-13 13:28:45 +08:00 |
|
|
chaideqing
|
69f20c1205
|
* replace xhtml to html when click card
|
2022-07-13 10:54:12 +08:00 |
|
|
王怡栋
|
7bc7fe0e54
|
Merge branch 'sprint/master_zhouxudong_60389' into 'master'
Sprint/master zhouxudong 60389
See merge request easycorp/zentaopms!4451
|
2022-07-11 07:56:48 +00:00 |
|
|
chaideqing
|
3532e82841
|
* fix card show blank above header
|
2022-07-11 15:29:26 +08:00 |
|
|
liumengyi
|
b8642a3350
|
* Finish task #60395.
|
2022-07-11 14:49:36 +08:00 |
|
|
zhouxudong
|
b5475f51b2
|
* Finish task #60394 #60392 #60389.
|
2022-07-11 03:28:17 +00:00 |
|
|
liumengyi
|
29993afa9e
|
* Optimize code for bug #23123.
|
2022-07-08 13:55:41 +08:00 |
|
|
liumengyi
|
26b430660a
|
* Fix bug #23123.
|
2022-07-08 13:29:56 +08:00 |
|
|
tianshujie
|
abce7ba766
|
* Fix bug #24314.
|
2022-07-08 10:55:17 +08:00 |
|
|
tianshujie
|
b4a9f36ad9
|
* Fix bug #24972.
|
2022-07-08 08:50:07 +08:00 |
|
|
liumengyi
|
3049879a44
|
* Fix bug of task #59482.
|
2022-07-07 09:40:07 +08:00 |
|
|
王怡栋
|
14b88ef75e
|
Merge branch 'sprint/211_liumengyi_59469' into 'master'
* Finish task #59469.
See merge request easycorp/zentaopms!4372
|
2022-07-06 06:17:57 +00:00 |
|
|
liumengyi
|
957d6f3249
|
* Fix bug of task #59469.
|
2022-07-06 11:11:45 +08:00 |
|
|
zhouxudong
|
ae9ac7d0c8
|
* Finish task #59748.
|
2022-07-06 01:36:53 +00:00 |
|
|
wangyidong
|
c88aa6b8f1
|
Merge branch 'zentaomax35'
|
2022-07-04 14:16:06 +08:00 |
|
|
孙广明
|
c4d5027b86
|
Merge branch 'fixbug_lang' into 'master'
Fixbug lang
See merge request easycorp/zentaopms!4271
|
2022-06-30 07:10:37 +00:00 |
|
|
王怡栋
|
4ab26414cb
|
Merge branch 'sprint/master_zhouxudong_24472' into 'master'
Sprint/master zhouxudong 24472
See merge request easycorp/zentaopms!4263
|
2022-06-30 06:07:01 +00:00 |
|
|
tianshujie
|
7528cdfdcf
|
* Fix bug #24554.
|
2022-06-30 13:16:31 +08:00 |
|
|
zhouxudong
|
bc16e41c73
|
* Fix bug #24472.
|
2022-06-30 02:44:29 +00:00 |
|
|
sunjun
|
c0a04777e5
|
fixbug_lang
|
2022-06-30 01:55:33 +00:00 |
|
|
sunjun
|
db7d9edd07
|
fixbug_lang
|
2022-06-30 01:41:25 +00:00 |
|
|
王怡栋
|
e00896f727
|
Merge branch 'sprint/master_zhouxudong_24417' into 'master'
Sprint/master zhouxudong 24417
See merge request easycorp/zentaopms!4237
|
2022-06-30 01:28:55 +00:00 |
|
|
zhouxudong
|
577ba86380
|
* Fix bug #24417.
|
2022-06-30 01:21:54 +00:00 |
|
|
zhouxudong
|
461235a048
|
* Fix bug #24417.
|
2022-06-29 09:00:33 +00:00 |
|
|
tanghucheng
|
9f25fc251b
|
* Fix bug #24090.
|
2022-06-29 14:39:19 +08:00 |
|
|
孙广明
|
b9f3120c8b
|
* Fix bug #24508.
|
2022-06-29 13:29:03 +08:00 |
|
|
mayue
|
c1c145e4b7
|
* Fix bug #24482.
|
2022-06-28 16:27:10 +08:00 |
|
|
liumengyi
|
38ff5fd283
|
* Fix bug #24464.
|
2022-06-28 15:20:31 +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
|
3c9da06a99
|
* Finish task #57860.
|
2022-06-28 07:04:52 +00:00 |
|
|
zhouxudong
|
a0d7f77554
|
* Finish task #57860.
|
2022-06-28 03:22:39 +00:00 |
|
|
zhouxudong
|
f0d829a16c
|
* FInish task #57860.
|
2022-06-28 03:17:42 +00:00 |
|
|
zhouxudong
|
2373246b97
|
* Finish task #57860.
|
2022-06-28 02:36:29 +00:00 |
|
|
zhouxudong
|
5bb3d83c4d
|
* Finish task #57860.
|
2022-06-28 01:55:53 +00:00 |
|
|
孙广明
|
f3d496d7fe
|
更新module/product/control.php
|
2022-06-28 01:27:25 +00:00 |
|
|
孙广明
|
da315c7aaf
|
* Fix product order bug.
|
2022-06-28 08:15:51 +08:00 |
|
|
zhouxudong
|
14766c32f6
|
* Finish task #57860.
|
2022-06-27 00:39:37 +00:00 |
|