Commit Graph
30623 Commits
Author SHA1 Message Date
孙广明 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
王怡栋 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
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
zenggang c79e9ef65f * Adjust code style 2021-12-02 01:07:37 +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
tianshujie 00ac35c9db * Delete extra blank lines. 2021-12-02 08:46:01 +08:00
tianshujie be83274876 * Fix the problem of recording product cookies. 2021-12-02 08:43:44 +08:00
李玉春 fd0fb325fa Merge branch 'sprint/174_songchenxuan_16967' into 'master'
Sprint/174 songchenxuan 16967

See merge request easycorp/zentaopms!713
2021-12-02 00:34:22 +00:00
孙广明 128af31eda Merge branch 'sprint/175_zhengrunyu_fixbug' into 'master'
*Finish task #fixbug.

See merge request easycorp/zentaopms!718
2021-12-02 00:21:59 +00:00
songchenxuan 0e97d5b419 * Fix bug #16967. 2021-12-02 08:17:13 +08:00
孙广明 178af23bb1 Merge branch 'sprint/175_liyuchun_bug' into 'master'
* Fix error.

See merge request easycorp/zentaopms!717
2021-12-02 00:16:15 +00:00
songchenxuan 97b2e63ea0 * Fix bug #16967. 2021-12-02 08:14:58 +08:00
zhengrunyu f274c52e33 *Finish task #fixbug. 2021-12-02 08:14:09 +08:00
xieqiyu 32a526275d * There is a problem with the drop-down of test cases. 2021-12-01 18:14:25 +08:00
李玉春 0b0aa04db1 Merge branch 'sprint/174_tianshujie_issue' into 'master'
* Modify the problem of function demonstration.

See merge request easycorp/zentaopms!714
2021-12-01 09:29:36 +00:00
liyuchun 71d27fc151 * Fix error. 2021-12-01 17:23:44 +08:00
tianshujie 92ad301e29 * Fix bug #16988. 2021-12-01 17:16:52 +08:00
mayue eec94fd383 * Fix bug #16936. 2021-12-01 17:14:43 +08:00
hufangzhou 7d59199f52 Merge branch 'sprint/174_hufangzhou_45079' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/174_hufangzhou_45079 2021-12-01 17:09:56 +08:00
hufangzhou 36fa35d3d1 * Fix bug #15832. 2021-12-01 17:09:52 +08:00
tianshujie 41da1fdb7e * Fix the problem of graying out the maintenance product. 2021-12-01 17:05:45 +08:00
liyuchun e44737b3b3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-01 16:48:31 +08:00