Commit Graph
720 Commits
Author SHA1 Message Date
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
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
孙广明 7b962c4e38 Merge branch 'pailei' 2022-03-07 10:56: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
孙广明 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
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
王怡栋 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
tianshujie 1c28a0462f * Change the die of the bug module to return print. 2022-01-11 08:09:13 +08:00
孙广明 c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
mayue 9d89d77c57 * Finish task #46527. 2021-12-30 13:10:17 +08:00
王怡栋 667cf60e42 * code for task #46552. 2021-12-28 15:16:08 +08:00
hufangzhou 9743ebbb92 * Finish task #46388. 2021-12-21 22:26:07 +08:00
zhujinyong 42fc345e2a Merge branch 'sprint/176_xieqiyu_mergeBranch' 2021-12-21 16:12:48 +08:00
hufangzhou 872a8b2bbd * Finish task #46096. 2021-12-21 14:30:38 +08:00