 wangyidong
|
e51b5309d1
|
* fix bug for api.
|
2022-05-16 14:17:36 +08:00 |
|
|
孙华伟
|
2a33fd3830
|
*Fix bug.
|
2022-05-13 17:32:26 +08:00 |
|
|
孙华伟
|
c8d4a93bbf
|
*Optemizi the code
|
2022-05-13 17:28:39 +08:00 |
|
|
孙广明
|
a770924dcf
|
Merge branch 'master' into 'sprint/189_mayue_task#53652'
# Conflicts:
# module/project/model.php
|
2022-05-12 05:01:42 +00:00 |
|
|
liumengyi
|
0e18988f6a
|
* Fix bug for close product.
|
2022-05-11 17:05:04 +08:00 |
|
|
mayue
|
98dcd7517f
|
* Optimize code.
|
2022-05-11 06:38:46 +00:00 |
|
|
孙广明
|
da6ab52f7b
|
Merge branch 'sprint/189_zhouxin_53658' into 'master'
Sprint/189 zhouxin 53658
See merge request easycorp/zentaopms!3321
|
2022-05-11 05:13:18 +00:00 |
|
|
zhouxin
|
c78ab4be77
|
* Adjust code.
|
2022-05-11 03:24:49 +00:00 |
|
|
zhouxin
|
c6ac480351
|
* Fix bug.
|
2022-05-11 03:05:13 +00:00 |
|
|
zhouxin
|
51ec6494a0
|
* Add comment.
|
2022-05-11 02:19:09 +00:00 |
|
|
zhouxin
|
b015ea5c77
|
* Finish task #53658.
|
2022-05-11 01:53:10 +00:00 |
|
|
daitingting
|
deb8d170a7
|
* Build operate menu for product.
|
2022-05-10 05:44:25 +00:00 |
|
|
daitingting
|
d577d57a33
|
* Add id for checking unique field.
|
2022-05-09 17:02:23 +08:00 |
|
|
daitingting
|
e30acad1f2
|
* Add id for checking unique field.
|
2022-05-09 07:56:17 +00:00 |
|
|
daitingting
|
96e460c47d
|
* Finish task #53549.
|
2022-05-09 06:41:35 +00:00 |
|
|
mayue
|
aeda6fbe78
|
* Fix bug #22064#22065.
|
2022-04-28 06:43:05 +00:00 |
|
|
朱金勇
|
4898f63820
|
Merge branch 'sprint/renying_Fixbug#21457' into 'master'
Sprint/renying fixbug#21457
See merge request easycorp/zentaopms!3051
|
2022-04-22 01:36:54 +00:00 |
|
|
tianshujie
|
edbc8e5d0b
|
* Fix bug #18060.
|
2022-04-21 15:52:57 +08:00 |
|
|
renying
|
b32081bab7
|
Fixbug#21457
|
2022-04-21 09:27:36 +08:00 |
|
|
hufangzhou
|
54f2910885
|
* Fix bug #21875.
|
2022-04-20 13:44:23 +08:00 |
|
|
zenggang
|
76278f3ca8
|
* Fix bug#16732
|
2022-04-15 02:21:33 +00:00 |
|
|
Zongjun Lan
|
8ef47e9292
|
* fix bug *18722
|
2022-04-12 10:58:35 +08:00 |
|
|
sunjun
|
95b2c3317a
|
*Fixbug_sunjun_17344
|
2022-04-08 10:11:16 +08:00 |
|
|
sunjun
|
7c540be4d7
|
*Fixbug_sunjun_17344
|
2022-04-08 09:37:49 +08:00 |
|
|
sunjun
|
e64527e7a0
|
*Fixbug_sunjun_17344
|
2022-04-07 09:25:13 +08:00 |
|
|
sunjun
|
365f6718c4
|
*Fixbug #17344
|
2022-04-06 17:12:01 +08:00 |
|
|
孙广明
|
67e3a3b4c4
|
Merge branch 'sunhuawei_fixbug_15989' into 'master'
Sunhuawei fixbug 15989
See merge request easycorp/zentaopms!2681
|
2022-04-01 02:50:22 +00:00 |
|
|
zenggang
|
d63710351c
|
* Fix bug#11161
|
2022-04-01 02:06:20 +00:00 |
|
|
sunjun
|
2dc2a6448f
|
*Fixbug #20372
|
2022-03-30 17:13:30 +08:00 |
|
|
孙华伟
|
5aea0c9ac7
|
*Optimize the code.
|
2022-03-28 17:17:13 +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 |
|
|
孙广明
|
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
|
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 |
|
|
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 |
|
|
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 |
|
|
liyuchun
|
166cda1186
|
* Fix bug #17235.
|
2022-03-22 14:12:44 +08:00 |
|
|
王怡栋
|
5117bf7541
|
* fix bug #15347,15345.
|
2022-03-17 11:26:01 +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 |
|