Commit Graph
1362 Commits
Author SHA1 Message Date
tianshujie a7d66c5fae * Fix bug #20572. 2022-03-10 10:05:34 +08:00
tianshujie 1afb4315be * Finish task #50389. 2022-03-09 16:06:41 +08:00
孙广明 4c218d7a69 Merge branch 'pailei_zhangzilong_49888' into 'pailei2'
Pailei zhangzilong 49888

See merge request easycorp/zentaopms!2155
2022-03-09 06:41:53 +00:00
xieqiyu 4ba238cd27 * Modify review code. 2022-03-09 14:36:50 +08:00
xieqiyu 139ea1e04a * Modify review code. 2022-03-09 11:17:36 +08:00
zhangzilong 590ba16d6a * Code for task #49888. 2022-03-09 09:32:18 +08:00
zhangzilong 110829f229 * Code for task #49888. 2022-03-08 13:09:45 +08:00
孙广明 5175dc617f * Code for story review btn. 2022-03-07 15:37:57 +08:00
hufangzhou d077423919 * Fix bug #50326. 2022-03-07 14:06:23 +08:00
zhangzilong 45ad8dbf96 * Code for task #49888. 2022-03-07 13:07:52 +08:00
孙广明 7b962c4e38 Merge branch 'pailei' 2022-03-07 10:56:26 +08:00
王怡栋 0aa901eb64 * fix bug #19908. 2022-03-02 11:05:30 +08:00
mayue 852020b924 * Finish task#49293. 2022-03-02 10:39:38 +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 74326a3331 * Optimize the code. 2022-03-01 14:40:00 +08:00
zhengrunyu 62699ca48d * Finish task 49294 . 2022-02-28 15:51:59 +08:00
xieqiyu 9024dae71e * Modify linked products when edit product. 2022-02-28 10:15:16 +08:00
孙广明 25f71e0a51 Merge branch 'sprint/185' into 'sprint/186_liumengyi_modify'
# Conflicts:
#   module/task/model.php
2022-02-25 00:41:58 +00:00
zhouxin 7ae4495abb Fix bug. 2022-02-24 09:21:58 +00:00
liumengyi 9bd39c1e98 * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:44:11 +08:00
xieqiyu 7c65ee9555 * Fix bug. 2022-02-24 16:30:18 +08:00
xieqiyu 5a518081d9 * Code for task#49304. 2022-02-24 16:21:20 +08:00
liumengyi e0814cd74b * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:15:08 +08:00
孙广明 bdaf8ced98 Merge branch 'sprint/185_zhouxin_49281' into 'sprint/185'
Sprint/185 zhouxin 49281

See merge request easycorp/zentaopms!1950
2022-02-24 07:19:35 +00:00
xieqiyu 9fa66c3d0f * Code for task#49304. 2022-02-24 14:40:14 +08:00
zhouxin baa5d32ef1 Finish task #49281. 2022-02-24 02:54:24 +00:00
孙广明 47c48e68a2 Merge branch 'sprint/185_fixbug_wangyidong' into 'sprint/185'
Sprint/185 fixbug wangyidong

See merge request easycorp/zentaopms!1878
2022-02-22 07:53:22 +00:00
zhujinyong 408f8d4d91 * Move die to return. 2022-02-22 14:15:00 +08:00
王怡栋 cc184728c1 * code for task #49348. 2022-02-22 10:54:43 +08:00
孙广明 ffbbfe417f Merge branch 'sprint/185' into 'sprint/185_zhangzilong_49284'
# Conflicts:
#   db/update16.4.sql
2022-02-18 06:23:22 +00:00
zhangzilong 4e84e5cbd7 * Finish task #49284. 2022-02-17 17:35:11 +08:00
王怡栋 218546e6c4 Merge branch 'sprint/tanghucheng_fixbug' into 'sprint/185'
* finish task #49421,49338.

See merge request easycorp/zentaopms!1838
2022-02-17 08:20:10 +00:00
tanghucheng 966f00c07a * finish task #49421,49338. 2022-02-17 14:58:59 +08:00
孙广明 36eec1ed28 Merge branch 'sprint/185_mayue_Bug11007' into 'sprint/185'
* Fix bug #11007.

See merge request easycorp/zentaopms!1836
2022-02-17 06:37:25 +00:00
zhujinyong d02ddc138c Merge branch 'lite' into sprint/185 2022-02-17 10:20:50 +08:00
mayue e80390a8f2 * Fix bug #11007. 2022-02-17 09:35:33 +08:00
zhujinyong 5bd64d9312 Merge branch 'lite' into sprint/185 2022-02-17 08:56:40 +08:00
tanghucheng e837186eba * code for task #49081. 2022-02-16 10:27:36 +08:00
liyuchun 5583b62fc9 Merge branch 'devops21' 2022-02-14 10:20:11 +08:00
tanghucheng c7fab53ed1 * finish task #49090. 2022-02-14 09:57:10 +08:00
tanghucheng ea1319a360 * adjust code. 2022-02-11 14:00:51 +08:00
孙广明 9748e70a31 * Fix bug #19356. 2022-02-10 09:37:34 +08:00
孙华伟 8e206e12e0 *Code for bug #48664. 2022-02-09 16:47:09 +08:00
孙华伟 e3c814d41d *Code for bug #48664. 2022-02-09 16:13:43 +08:00
孙华伟 9d88bfccfb *Code for bug #48664. 2022-02-09 15:58:14 +08:00
孙华伟 cad3583170 * Code for bug #48664. 2022-02-09 15:19:10 +08:00
孙华伟 dff60a8c7d Fix bug #48664 2022-02-09 10:26:41 +08:00
tanghucheng 41f254686a * adjust for reviewDate. 2022-01-30 12:16:20 +08:00
tanghucheng f264c07984 * add vision for story. 2022-01-28 09:50:21 +08:00
tianshujie 45cbb3d9d6 * Fix bug #19065. 2022-01-27 15:34:49 +08:00