Commit Graph
30552 Commits
Author SHA1 Message Date
xieqiyu 039f7f037d * Fix bug of check iframe. 2022-03-30 14:11:28 +08:00
李玉春 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
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
zenggang d9e58c3f17 * Fix bug#21095,21093 2022-03-29 09:37:55 +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
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
孙华伟 fa2ee82a2b *Fix bug#16679 2022-03-29 16:08:11 +08:00
xieqiyu 3cbebadd60 * Fix bug#21277. 2022-03-29 15:54:29 +08: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
tianshujie 7885b87ef3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tianshujie_bug16101 2022-03-29 14:30:55 +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