Commit Graph
36511 Commits
Author SHA1 Message Date
李玉春 d0d33aa277 Merge branch 'devops24_51117' into 'master'
Finish task#51117

See merge request easycorp/zentaopms!2629
2022-03-30 06:07:52 +00:00
孙广明 2b1b3b1733 Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #20939.

See merge request easycorp/zentaopms!2619
2022-03-30 06:03:01 +00:00
孙广明 3a808fc514 Merge branch 'fixbugs_zhouxin_17322' into 'master'
Fixbugs zhouxin 17322

See merge request easycorp/zentaopms!2631
2022-03-30 05:12:36 +00:00
孙广明 60b5461414 Merge branch 'fixbugs_zhouxin_21131' into 'master'
* Fix bug #21131.

See merge request easycorp/zentaopms!2632
2022-03-30 05:12:19 +00:00
zhouxin a8d3ff2801 * Fix bug #17322. 2022-03-30 05:11:32 +00:00
liyuchun 1aa30343a4 * Adjust style. 2022-03-30 11:38:04 +08:00
zhouxin cd5ac50b6f * Fix bug #17322. 2022-03-30 03:30:02 +00:00
zhouxin 5cfff22e5a * Fix bug #21131. 2022-03-30 03:27:30 +00:00
zhouxin 1d21f7f62d * Fix bug #17322. 2022-03-30 03:23:48 +00:00
李玉春 c83e0de8c7 Merge branch 'master_xieqiyu_21283' into 'master'
* Fix bug#21283.

See merge request easycorp/zentaopms!2630
2022-03-30 03:18:12 +00:00
xieqiyu f418c9b954 * Fix bug#21283. 2022-03-30 11:10:49 +08:00
李玉春 9b82ef6e78 Merge branch 'sprint/tianshujie_bug21282' into 'master'
* Fix bug #21282.

See merge request easycorp/zentaopms!2628
2022-03-30 03:04:20 +00:00
tianshujie 317ff297b1 * Fix Kanban related issues. 2022-03-30 11:02:29 +08:00
tianshujie 0e3779ca1b * Fix Kanban related issues. 2022-03-30 10:45:01 +08:00
zenggang 5ceeb72655 * Finish task#51117 2022-03-30 02:43:34 +00:00
liyuchun ca5ef459da * Fix bug #16579. 2022-03-30 10:36:12 +08:00
tianshujie 04316599a4 * Modify the error. 2022-03-30 10:26:17 +08:00
李玉春 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
tianshujie 63e915a555 * Modify the code judgment logic. 2022-03-30 10:10:19 +08:00
liyuchun 394b56a5e1 * Fix bug #19232. 2022-03-30 10:09:37 +08:00
liyuchun aeef231059 * Fix bug #17812. 2022-03-30 10:06:32 +08:00
孙华伟 9c34cc22a2 Optimize the code. 2022-03-30 01:42:07 +00:00
tianshujie b638bd1c83 * Fix bug #21282. 2022-03-30 09:40:23 +08: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
liyuchun cd9b896e71 * Fix bug #18316. 2022-03-29 17:30:47 +08: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
liyuchun e0a2088ce8 * Fix bug #20939. 2022-03-29 16:20:43 +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