Commit Graph
36488 Commits
Author SHA1 Message Date
李玉春 3f292c2d80 Merge branch 'sunhuawei_fixbug_16677' into 'master'
*Fix bug#16677.

See merge request easycorp/zentaopms!2621
2022-03-30 02:20:52 +00:00
孙华伟 9c34cc22a2 Optimize the code. 2022-03-30 01:42:07 +00:00
孙华伟 c4d579152b Optimize the code 2022-03-30 01:35:32 +00:00
王怡栋 c5669c8e34 Merge branch 'sprint/master_fixbug' into 'master'
* Fix bug for lite.

See merge request easycorp/zentaopms!2627
2022-03-30 01:11:59 +00:00
tanghucheng f1449d3b6b * Fix bug. 2022-03-30 09:09:04 +08:00
李玉春 bb121a405a Merge branch 'devops23_21095' into 'master'
Fix bug#21095,21093

See merge request easycorp/zentaopms!2625
2022-03-30 01:05:29 +00:00
朱金勇 b77563e431 Merge branch 'sprint/autoTest_liumengyi_kanban' into 'master'
* Add auto test of kanban.

See merge request easycorp/zentaopms!2626
2022-03-30 01:05:05 +00:00
liumengyi 4a7c93b0ef * Add auto test of kanban. 2022-03-30 09:04:11 +08:00
liumengyi b6f40cd07b * Add auto test of kanban. 2022-03-29 17:52:09 +08:00
zenggang d9e58c3f17 * Fix bug#21095,21093 2022-03-29 09:37:55 +00:00
孙广明 54852b1c3e Merge branch 'app_zry' into 'master'
* Fix bug 21065.

See merge request easycorp/zentaopms!2620
2022-03-29 09:23:11 +00:00
王怡栋 2fe581e593 Merge branch 'sprint/master_fixbug' into 'master'
* Fix bug #21280.

See merge request easycorp/zentaopms!2622
2022-03-29 09:09:19 +00:00
tanghucheng 02c856cf7d * Fix bug #21280. 2022-03-29 16:48:19 +08:00
孙华伟 e26cbcc00c *Fix bug#16677. 2022-03-29 16:40:05 +08:00
zhengrunyu e75482f8a2 * Fix bug 21065. 2022-03-29 16:30:56 +08:00
李玉春 8ba2c1bb83 Merge branch 'sunhuawei_fixbug_16679' into 'master'
*Fix bug#16679

See merge request easycorp/zentaopms!2616
2022-03-29 08:13:59 +00:00
孙广明 6274be6d47 Merge branch 'master_xieqiyu_21277' into 'master'
* Fix bug#21277.

See merge request easycorp/zentaopms!2614
2022-03-29 08:13:24 +00:00
王怡栋 49a9c4bda0 Merge branch 'sprint/fixbug_hufangzhou_18696' into 'master'
* Fix bug #18696.

See merge request easycorp/zentaopms!2609
2022-03-29 08:12:11 +00:00
王怡栋 8f2e09fb1e Merge branch 'sgm_storytest' into 'master'
Sgm storytest

See merge request easycorp/zentaopms!2615
2022-03-29 08:11:40 +00:00
孙华伟 fa2ee82a2b *Fix bug#16679 2022-03-29 16:08:11 +08:00
孙广明 294a2ebfb2 Merge branch 'autotest_ly' 2022-03-29 16:04:22 +08:00
孙广明 61121d7091 * Add story test. 2022-03-29 16:00:21 +08:00
xieqiyu 3cbebadd60 * Fix bug#21277. 2022-03-29 15:54:29 +08:00
孙广明 372febd731 Merge branch 'master' into 'autotest_ly'
# Conflicts:
#   test/ztest
2022-03-29 07:53:51 +00:00
liyang 0225546b0d add test of build 2022-03-29 15:51:53 +08:00
李玉春 405d75736f Merge branch 'cyy_app' into 'master'
* Add return for file upload size.

See merge request easycorp/zentaopms!2611
2022-03-29 07:50:22 +00:00
李玉春 3342320ff0 Merge branch 'sprint/tianshujie_bug16101' into 'master'
Sprint/tianshujie bug16101

See merge request easycorp/zentaopms!2612
2022-03-29 07:47:51 +00:00
tianshujie 906a4b7f04 * Fix bug #16607. 2022-03-29 15:46:08 +08:00
tianshujie aa1c6959dd * Fix bug #16607. 2022-03-29 15:39:18 +08:00
tianshujie 84aaab5508 * Fix bug #16607. 2022-03-29 15:00:12 +08:00
caoyanyi 4e1c4c0249 * Add return for file upload size. 2022-03-29 14:36:29 +08:00
tianshujie 7885b87ef3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tianshujie_bug16101 2022-03-29 14:30:55 +08:00
孙广明 78b5d154af Merge branch 'sprint/autoTest_liumengyi_kanban' into 'master'
* Add auto test of kanban.

See merge request easycorp/zentaopms!2610
2022-03-29 06:29:02 +00:00
liumengyi 49eb5b7dc3 * Add auto test of kanban. 2022-03-29 14:27:03 +08:00
李玉春 4d28e9772d Merge branch 'devops24_21092' into 'master'
Fix bug#21092

See merge request easycorp/zentaopms!2600
2022-03-29 06:19:09 +00:00
zenggang 028833b838 * Fix bug#21092,11398 2022-03-29 06:16:14 +00:00
孙广明 1dac727a25 Merge branch 'fixbug' into 'master'
* Code for bug #21058.

See merge request easycorp/zentaopms!2593
2022-03-29 06:01:38 +00:00
孙广明 04d9e62697 Merge branch 'fixbugs_zhouxin_16707' into 'master'
* Fix bug #16707.

See merge request easycorp/zentaopms!2602
2022-03-29 06:01:15 +00:00
tianshujie a0c4457a95 * Fix bug #16101. 2022-03-29 13:59:16 +08:00
孙广明 b7216638ec Merge branch 'liyuchun_fixbug_51009' into 'master'
* Fix bug #13194.

See merge request easycorp/zentaopms!2608
2022-03-29 05:58:52 +00:00
孙广明 0bd44c1511 Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #20804,20946.

See merge request easycorp/zentaopms!2598
2022-03-29 05:58:04 +00:00
李玉春 8b24143995 Merge branch 'fixbug_sunjun_21258' into 'master'
*Fixbug #21258

See merge request easycorp/zentaopms!2606
2022-03-29 05:54:21 +00:00
hufangzhou df4c62e876 * Fix bug #18696. 2022-03-29 13:47:11 +08:00
liyuchun 1fcbef1a79 * Fix bug #13194. 2022-03-29 13:45:36 +08:00
孙广明 0fe342e621 Merge branch 'master_xieqiyu_16137' into 'master'
* Fix bug#16137,#16136.

See merge request easycorp/zentaopms!2604
2022-03-29 05:26:06 +00:00
孙广明 dd871db635 Merge branch 'autotest_ly' into 'master'
update story data

See merge request easycorp/zentaopms!2607
2022-03-29 05:25:35 +00:00
liyang 5460fc9b9b update story data 2022-03-29 13:23:28 +08:00
zhouxin 376de6d824 * Fix bug #16707. 2022-03-29 04:28:39 +00:00
李玉春 91b8835642 Merge branch 'sprint/tianshujie_bug21028' into 'master'
Sprint/tianshujie bug21028

See merge request easycorp/zentaopms!2605
2022-03-29 03:30:23 +00:00
tianshujie 93d7e2dd1d * Fix bug #14873. 2022-03-29 11:27:25 +08:00