 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 |
|
|
hufangzhou
|
eebcfaad58
|
* Adjust the spacing of dynamic block and dynamic page.
|
2022-06-24 13:33:11 +08:00 |
|
|
xieqiyu
|
d4ac1b4a5f
|
* Code for task#57850.
|
2022-06-23 17:20:19 +08:00 |
|
|
王怡栋
|
c69384617a
|
Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.
See merge request easycorp/zentaopms!4083
|
2022-06-23 00:39:25 +00:00 |
|
|
xieqiyu
|
21b0217aa8
|
* Code for task#57850.
|
2022-06-22 13:15:44 +08:00 |
|
|
hufangzhou
|
ac69cd1afb
|
* Finish task #57883.
|
2022-06-22 10:39:55 +08:00 |
|
|
tianshujie
|
7372f7f936
|
* Finish story #32623.
|
2022-06-22 08:51:05 +08:00 |
|
|
hufangzhou
|
adad8ea3ae
|
* Finish task #57882, #57874, #57873, #57855.
|
2022-06-21 17:30:36 +08:00 |
|
|
王怡栋
|
619c03be5d
|
Merge branch 'sgm_fixbug' into 'master'
* Code for product order.
See merge request easycorp/zentaopms!4012
|
2022-06-17 08:26:27 +00:00 |
|
|
孙广明
|
9ac3ed7851
|
* Code for product order.
|
2022-06-17 16:23:46 +08:00 |
|
|
tianshujie
|
c45f80417a
|
* Modify Modify program prompt when editing a product.
|
2022-06-17 08:59:33 +08:00 |
|
|
孙广明
|
8002199638
|
Merge branch 'sprint/tianshujie' into 'master'
* Delete useless code.
See merge request easycorp/zentaopms!3993
|
2022-06-16 09:24:01 +00:00 |
|
|
tianshujie
|
fa117ec408
|
* Delete useless code.
|
2022-06-16 17:23:34 +08:00 |
|
|
tianshujie
|
fc2aea0aa9
|
* Delete useless code.
|
2022-06-16 17:21:50 +08:00 |
|
|
孙广明
|
45cb7876dc
|
Merge branch 'sprint/tianshujie' into 'master'
* If the project linked with the product belongs to the changed program, the...
See merge request easycorp/zentaopms!3991
|
2022-06-16 09:19:18 +00:00 |
|
|
孙广明
|
bb337fdc9c
|
Merge branch 'fixbug_php' into 'master'
fixbug_php
See merge request easycorp/zentaopms!3990
|
2022-06-16 09:14:22 +00:00 |
|
|
sunjun
|
67dbc57ea8
|
fixbug_php
|
2022-06-16 09:13:03 +00:00 |
|
|
tianshujie
|
9f21391681
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-06-16 17:11:07 +08:00 |
|
|
tianshujie
|
5bcad0bd62
|
* If the project linked with the product belongs to the changed program, the unmodifiable information will not be prompted.
|
2022-06-16 17:09:30 +08:00 |
|
|
sunjun
|
fa3a7a318c
|
fixbug_php
|
2022-06-16 09:04:42 +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 |
|
|
mayue
|
9fd71c342b
|
* Fix bug #23682.
|
2022-06-16 16:30:54 +08:00 |
|
|
sunjun
|
977a81d359
|
fixbug_sunjun_23810
|
2022-06-16 06:31:49 +00:00 |
|
|
sunjun
|
7dfc3f64a2
|
fixbug_sunjun_23810
|
2022-06-16 05:49:32 +00:00 |
|
|
孙广明
|
8db0b61c87
|
Merge branch 'sprint_204_57091' into 'master'
Sprint 204 57091
See merge request easycorp/zentaopms!3948
|
2022-06-16 00:28:26 +00:00 |
|
|
sunjun
|
d0dfc61e48
|
sprint_57091
|
2022-06-15 14:25:01 +00:00 |
|