Commit Graph
26249 Commits
Author SHA1 Message Date
liyuchun 2b331d987d * Fix bug #16885. 2021-12-02 16:00:32 +08:00
liyuchun 9c9756bdd8 * Fix bug #16853. 2021-12-02 15:53:06 +08:00
liyuchun 8e11431865 * Adjust style. 2021-12-02 15:46:53 +08:00
liyuchun da73e10709 * Fix bug #16856. 2021-12-02 15:32:27 +08:00
liyuchun c943151157 * Fix bug #16847. 2021-12-02 14:28:50 +08:00
liyuchun 2899947808 * Fix bug #16725. 2021-12-02 14:18:13 +08:00
liyuchun 696892f246 * Fix bug #16716. 2021-12-02 14:14:29 +08:00
liyuchun b75c77b3e7 * Fix bug #17000. 2021-12-02 14:07:06 +08:00
liyuchun 6caf5097ec * Fix error of gitlab. 2021-12-02 13:54:06 +08:00
liyuchun 0e30ba0a3b * Fix bug #16836. 2021-12-02 13:19:50 +08:00
李玉春 7bcbab370a Merge branch 'sprint/174_songchenxuan_16872' into 'master'
* Fix bug #16872.

See merge request easycorp/zentaopms!735
2021-12-02 05:08:27 +00:00
李玉春 22aff07db9 Merge branch 'sprint/174_songchenxuan_addcomment' into 'master'
* Add testcase batchEdit comment.

See merge request easycorp/zentaopms!720
2021-12-02 05:08:14 +00:00
songchenxuan febde653ad * Fix bug #16872. 2021-12-02 13:06:03 +08:00
李玉春 ee0bdfb1a2 Merge branch 'devops_16736' into 'master'
* Fix bug#16846

See merge request easycorp/zentaopms!732
2021-12-02 05:05:04 +00:00
李玉春 38f5ab4145 Merge branch 'master' into 'sprint/175_sgm_fixbug'
# Conflicts:
#   module/execution/control.php
#   module/message/config.php
2021-12-02 05:04:29 +00:00
孙广明 575d9e098f Merge branch 'sprint/175_zry_fixbug' into 'master'
Sprint/175 zry fixbug

See merge request easycorp/zentaopms!733
2021-12-02 03:22:23 +00:00
李玉春 199577f068 Merge branch 'sprint/29_zhouxin_16905' into 'master'
Fix bug #16905.

See merge request easycorp/zentaopms!709
2021-12-02 03:19:57 +00:00
zhengrunyu bd075ac17d *Fixbug #16978. 2021-12-02 11:18:53 +08:00
李玉春 c543df8b75 Merge branch 'sprint/174_tianshujie_bug' into 'master'
* Fix the problem of recording product cookies.

See merge request easycorp/zentaopms!719
2021-12-02 03:16:40 +00:00
李玉春 4afdccfc5e Merge branch 'sprint/174_tianshujie_16897' into 'master'
* Fix bug #16897.

See merge request easycorp/zentaopms!725
2021-12-02 03:16:18 +00:00
李玉春 313c7d8ee3 Merge branch 'sprint/174_tianshujie_16925' into 'master'
* Fix bug #16925.

See merge request easycorp/zentaopms!729
2021-12-02 03:09:54 +00:00
zenggang 0803759223 * Fix bug#16846 2021-12-02 03:06:27 +00:00
孙广明 ed35de7a0f * Fix code error. 2021-12-02 11:05:47 +08:00
王怡栋 b043ff0772 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-02 10:55:40 +08:00
王怡栋 bf16167b19 * Support for flow. 2021-12-02 10:55:04 +08:00
李玉春 b1cd56f4b3 Merge branch 'sprint/174_hufangzhou_45079' into 'master'
Sprint/174 hufangzhou 45079

See merge request easycorp/zentaopms!715
2021-12-02 02:53:09 +00:00
hufangzhou 30e22a7b64 Merge branch 'sprint/174_hufangzhou_45079' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/174_hufangzhou_45079 2021-12-02 10:51:23 +08:00
hufangzhou 563979094c * Fix bug #16986. 2021-12-02 10:50:44 +08:00
孙广明 93547bf85b Merge branch 'sprint/devops_liyuchun_16893' into 'master'
Fix bug #16997, #16893.

See merge request easycorp/zentaopms!722
2021-12-02 02:39:31 +00:00
tianshujie ee60476724 * Fix bug #16925. 2021-12-02 10:19:21 +08:00
zhengrunyu 0a7b5b0efc * Code for kanban. 2021-12-02 10:10:20 +08:00
王怡栋 d99bd57aa6 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-02 10:06:59 +08:00
xieqiyu fa6b49493f * Fix bug: The problem of execution requirement list module. 2021-12-02 10:06:24 +08:00
王怡栋 f25d797b54 * adjust for flow. 2021-12-02 10:06:02 +08:00
hufangzhou 33a49e77c8 Merge branch 'sprint/174_hufangzhou_45079' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/174_hufangzhou_45079 2021-12-02 10:04:23 +08:00
hufangzhou 3c8e265ab7 * Fix bug #16986. 2021-12-02 10:04:14 +08:00
tianshujie a5598ddf64 * Fix bug #16897. 2021-12-02 10:04:02 +08:00
李玉春 d1b59fc5b0 Merge branch 'devops_16945' into 'master'
* Fix bug#16945

See merge request easycorp/zentaopms!721
2021-12-02 01:55:01 +00:00
liyuchun e0b03a60a7 * Fix bug #16999. 2021-12-02 09:54:03 +08:00
zhengrunyu 79ce6537df * Code for kanban. 2021-12-02 09:53:41 +08:00
李玉春 4c29226156 Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master'
* Fix bug #16987.

See merge request easycorp/zentaopms!723
2021-12-02 01:48:29 +00:00
mayue 8c6e0fabfb * Modify code #16987. 2021-12-02 09:44:12 +08:00
mayue 07f8a820b0 * Code format #16987. 2021-12-02 09:28:02 +08:00
孙广明 4b94092737 * Finish task #45162. 2021-12-02 09:24:01 +08:00
mayue 63d4d3dad8 * Fix bug #16987. 2021-12-02 09:20:37 +08:00
xieqiyu 3755502cf5 * Fix bug : Unit test product drop-down error. 2021-12-02 09:12:50 +08:00
zenggang 54ab343ed1 * Adjust code style 2021-12-02 01:10:30 +00:00
liyuchun c3b824d946 * Fix bug #16997. 2021-12-02 09:06:23 +08:00
zenggang bcb6dbbe0a * Fix bug#16945 2021-12-02 00:54:51 +00:00
liyuchun d68810fd4a * Fix bug #16893. 2021-12-02 08:54:51 +08:00