 王怡栋
|
d02b555d87
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20165
See merge request easycorp/zentaopms!2647
|
2022-03-31 02:41:12 +00:00 |
|
|
sunjun
|
2dc2a6448f
|
*Fixbug #20372
|
2022-03-30 17:13:30 +08:00 |
|
|
Zongjun Lan
|
df1dc3dd9b
|
* fix bug #20165
|
2022-03-30 16:51:14 +08:00 |
|
|
王怡栋
|
6c078665da
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!2636
|
2022-03-30 08:00:01 +00:00 |
|
|
mayue
|
1c05b13892
|
* Fix bug #16456.
|
2022-03-30 15:47:04 +08:00 |
|
|
tianshujie
|
4f4dfd990e
|
* Optimize code logic.
|
2022-03-30 15:22:27 +08:00 |
|
|
tianshujie
|
7c97c4ad63
|
* Fix bug #21266.
|
2022-03-30 11:22:06 +08:00 |
|
|
李玉春
|
b26b17ca35
|
Merge branch 'cyy_11655' into 'master'
* Fix bug #11655 and add repo create check.
See merge request easycorp/zentaopms!2590
|
2022-03-29 00:54:42 +00:00 |
|
|
caoyanyi
|
589dbaff70
|
* Fix bug #12791.
|
2022-03-28 17:25:36 +08:00 |
|
|
李玉春
|
e6319bec6d
|
Merge branch 'sunhuawei_fixbug_14756' into 'master'
*Fix bug#14756.
See merge request easycorp/zentaopms!2592
|
2022-03-28 08:58:57 +00:00 |
|
|
孙华伟
|
d8d1e2e3ee
|
*Fix bug#14756.
|
2022-03-28 16:47:35 +08:00 |
|
|
孙广明
|
8b8dccd9cd
|
Merge branch 'mayue_optimize_code' into 'master'
* Optimize code.
See merge request easycorp/zentaopms!2581
|
2022-03-28 07:06:34 +00:00 |
|
|
mayue
|
7fc0cd6230
|
* Optimize code.
|
2022-03-28 15:02:28 +08:00 |
|
|
孙华伟
|
f437bbf1d1
|
*Fix bug#13786.
|
2022-03-28 14:17:23 +08:00 |
|
|
mayue
|
0a562d579a
|
* Optimize code.
|
2022-03-28 10:58:58 +08:00 |
|
|
mayue
|
1dc8f123df
|
* Optimize code.
|
2022-03-28 10:56:14 +08:00 |
|
|
zenggang
|
0867f72e20
|
* Finish task#51136
|
2022-03-25 07:56:31 +00:00 |
|
|
孙广明
|
0d6d80e6f2
|
Merge branch 'sprint/autoTest_liumengyi_product' into 'master'
* Add auto test of product.
See merge request easycorp/zentaopms!2551
|
2022-03-25 07:33:06 +00:00 |
|
|
liumengyi
|
2af66dd17f
|
* Fix bug.
|
2022-03-25 15:29:40 +08:00 |
|
|
mayue
|
6f3071f217
|
* Optimize code.
|
2022-03-25 13:48:00 +08:00 |
|
|
mayue
|
f184873bca
|
* Fix bug #17402.
|
2022-03-25 13:45:28 +08:00 |
|
|
孙广明
|
70ef6bae33
|
Merge branch 'fixbug_zhouxin_16571' into 'master'
* Fix bug #16571.
See merge request easycorp/zentaopms!2498
|
2022-03-25 03:17:04 +00:00 |
|
|
mayue
|
71d64d8e65
|
* Handling PHP compatibility issues.
|
2022-03-25 11:05:18 +08:00 |
|
|
孙广明
|
74029a1a9f
|
* Fix product whitelist bug.
|
2022-03-25 10:29:12 +08:00 |
|
|
李玉春
|
169fa0c19e
|
Merge branch 'mayue_fix_bug#13804' into 'master'
* Fix bug #13804.
See merge request easycorp/zentaopms!2520
|
2022-03-24 09:21:04 +00:00 |
|
|
朱金勇
|
b2b30ea4bc
|
Merge branch 'sprint/sunhao/optimize_dropmenu' into 'master'
* optimize UI for dropmenu.
See merge request easycorp/zentaopms!2519
|
2022-03-24 09:20:45 +00:00 |
|
|
mayue
|
fb1821c735
|
* Optimize code.
|
2022-03-24 17:19:20 +08:00 |
|
|
mayue
|
7d2b061a75
|
* Fix bug #13804.
|
2022-03-24 17:06:28 +08:00 |
|
|
孙广明
|
133c7f7b04
|
Merge branch 'master' into 'sprint/autoTest_liumengyi_product'
# Conflicts:
# module/product/model.php
|
2022-03-24 09:04:36 +00:00 |
|
|
liumengyi
|
333cc3fbb2
|
* Modify code.
|
2022-03-24 17:02:26 +08:00 |
|
|
Hao Sun
|
539c797bd5
|
* bug #14569, optimize style for dropmenu.
|
2022-03-24 17:01:41 +08:00 |
|
|
zhouxin
|
b563bbd22e
|
* Fix bug #16571.
|
2022-03-24 02:50:58 +00:00 |
|
|
tianshujie
|
9178a6e3b3
|
* Modify variable name.
|
2022-03-24 10:27:42 +08:00 |
|
|
tianshujie
|
9b7d8686c7
|
* Modify the judgment logic.
|
2022-03-24 09:42:08 +08:00 |
|
|
tianshujie
|
e9ee8a176d
|
* Fix bug #19072.
|
2022-03-24 09:35:39 +08:00 |
|
|
孙广明
|
0c79df3fb6
|
Merge branch 'wyd_fixbug' into 'master'
Wyd fixbug
See merge request easycorp/zentaopms!2461
|
2022-03-23 00:53:36 +00:00 |
|
|
孙广明
|
8ce81869a2
|
Merge branch 'mayue_fix_bug#21052' into 'master'
* Fix bug #21052.
See merge request easycorp/zentaopms!2451
|
2022-03-22 07:58:26 +00:00 |
|
|
孙广明
|
41eee3ddd4
|
Merge branch 'master' into 'liyuchun_bug_17235'
# Conflicts:
# module/common/model.php
|
2022-03-22 07:43:58 +00:00 |
|
|
mayue
|
c86f396201
|
* Fix bug #21052.
|
2022-03-22 14:52:37 +08:00 |
|
|
liyuchun
|
166cda1186
|
* Fix bug #17235.
|
2022-03-22 14:12:44 +08:00 |
|
|
xieqiyu
|
e2fbaa6828
|
* Fix bug#20396.
|
2022-03-22 11:10:44 +08:00 |
|
|
王怡栋
|
fe91dc8481
|
Merge branch 'pailei2'
|
2022-03-22 09:01:03 +08:00 |
|
|
xieqiyu
|
0d21516997
|
* Modify create bug.
|
2022-03-22 08:40:43 +08:00 |
|
|
孙华伟
|
0627138877
|
*Fix bug 20355
|
2022-03-21 11:18:06 +08:00 |
|
|
zhouxudong
|
bf88ebd2e4
|
* Fix bug #16264.
|
2022-03-21 08:43:01 +08:00 |
|
|
zhouxin
|
7bd4cb4418
|
Fix bug #14564.
|
2022-03-18 04:41:31 +00:00 |
|
|
王怡栋
|
5117bf7541
|
* fix bug #15347,15345.
|
2022-03-17 11:26:01 +08:00 |
|
|
王怡栋
|
c1f3258a74
|
* adjust for get dynamic.
|
2022-03-14 16:08:58 +08:00 |
|
|
zhouxudong
|
3b6f94502b
|
* Fix bu* Fix bugg
|
2022-03-11 14:27:15 +08:00 |
|
|
zhouxudong
|
430b666870
|
* Finish task #50400.
|
2022-03-11 11:14:18 +08:00 |
|