 mayue
|
7fc0cd6230
|
* Optimize code.
|
2022-03-28 15:02:28 +08: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 |
|
|
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 |
|
|
孙广明
|
5339844ad2
|
Merge branch 'pailei2_zhouxin_50414' into 'pailei2'
Pailei2 zhouxin 50414
See merge request easycorp/zentaopms!2182
|
2022-03-10 05:23:45 +00:00 |
|
|
zhouxin
|
38ebc88fd5
|
Fix bug.
|
2022-03-10 03:20:19 +00:00 |
|
|
zhouxin
|
ccdcec9e32
|
Fix bug 50414.
|
2022-03-10 01:49:52 +00:00 |
|
|
zhouxudong
|
bf07964a60
|
* Finish task #50424.
|
2022-03-09 16:46:20 +08:00 |
|
|
tianshujie
|
03390a6900
|
* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.
|
2022-03-08 13:01:53 +08:00 |
|
|
孙广明
|
1b137f7bc8
|
Merge branch 'sprint/187_tianshujie' into 'master'
Sprint/187 tianshujie
See merge request easycorp/zentaopms!2107
|
2022-03-07 05:13:55 +00:00 |
|
|
孙广明
|
7b962c4e38
|
Merge branch 'pailei'
|
2022-03-07 10:56:26 +08:00 |
|
|
xieqiyu
|
2b83d5d647
|
* Fix bug#20385.
|
2022-03-07 10:45:30 +08:00 |
|
|
tianshujie
|
9af3dcbb09
|
* Finish task #50303.
|
2022-03-07 08:47:26 +08:00 |
|
|
tianshujie
|
85f96e6489
|
* Fix bug #20260.
|
2022-03-04 13:49:58 +08:00 |
|
|
xieqiyu
|
e30e3f81d3
|
* Fix bug#20268.
|
2022-03-02 15:25:33 +08:00 |
|
|
Zongjun Lan
|
5979f32712
|
* fix bug 20029
|
2022-03-02 15:04:12 +08:00 |
|
|
孙广明
|
6873b1061f
|
Merge branch 'sprint/185_xieqiyu_49304' into 'pailei'
Sprint/185 xieqiyu 49304
See merge request easycorp/zentaopms!2007
|
2022-03-01 07:04:26 +00:00 |
|
|
tianshujie
|
b7c3e92e95
|
* Modify version judgment logic.
|
2022-02-24 16:17:26 +08:00 |
|
|
xieqiyu
|
9fa66c3d0f
|
* Code for task#49304.
|
2022-02-24 14:40:14 +08:00 |
|
|
zhujinyong
|
5a334ccb86
|
* Fix bug: return error.
|
2022-02-22 09:26:31 +08:00 |
|
|
Wenrui LI
|
59892b5d77
|
* push to array with braces not plus sign, bug #19195.
|
2022-02-21 11:26:22 +08:00 |
|
|
zhangzilong
|
4e84e5cbd7
|
* Finish task #49284.
|
2022-02-17 17:35:11 +08:00 |
|
|
王怡栋
|
877cc194e9
|
* fix bug for #18630.
|
2022-01-21 13:32:50 +08:00 |
|
|
孙广明
|
7f278b4c79
|
* Fix bug.
|
2022-01-18 15:10:57 +08:00 |
|
|
孙广明
|
b01b6a90eb
|
Merge branch 'kanban'
|
2022-01-17 10:34:08 +08:00 |
|
|
孙广明
|
758c03968f
|
* Add kanban type in query.
|
2022-01-17 08:41:59 +08:00 |
|