Commit Graph
39589 Commits
Author SHA1 Message Date
李玉春 84fe5b847e Merge branch 'sprint/194_liumengyi_23012' into 'master'
* Fix bug #23012.

See merge request easycorp/zentaopms!3641
2022-05-27 03:02:02 +00:00
liumengyi 62445ea7b0 * Code format. 2022-05-27 10:59:23 +08:00
liumengyi f889692b40 * Remove empty line. 2022-05-27 10:47:19 +08:00
liumengyi 87ef728908 * Fix bug #23012. 2022-05-27 10:46:02 +08:00
李玉春 c96ae16062 Merge branch 'sprint/194_liumengyi_23012' into 'master'
* Fix bug #23022.

See merge request easycorp/zentaopms!3637
2022-05-27 01:54:16 +00:00
liumengyi ecdbeb4e0a * Fix bug #23022. 2022-05-27 09:51:32 +08:00
李玉春 50f48a4c7e Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #22979.

See merge request easycorp/zentaopms!3634
2022-05-27 00:36:34 +00:00
tianshujie bee7fe5ae4 * Export tasks Add task mode. 2022-05-27 05:38:05 +08:00
tianshujie ae096f635c * Fix bug #22979. 2022-05-26 21:32:07 +08:00
tianshujie 53e95069e4 * Fix bug #22979. 2022-05-26 21:08:37 +08:00
王怡栋 a0af734e79 Merge branch 'sprint/master_zhouxudong_54991' into 'master'
Sprint/master zhouxudong 54991

See merge request easycorp/zentaopms!3626
2022-05-26 09:28:41 +00:00
zhouxudong 715527fd59 * Finish task #54991. 2022-05-26 09:19:50 +00:00
王怡栋 76c5d782a4 Merge branch 'sprint/193_hufangzhou_xuansql' into 'master'
* Add the xuanxuan upgrade sql.

See merge request easycorp/zentaopms!3625
2022-05-26 09:19:48 +00:00
hufangzhou 9fe7cf8aee * Delete the check of international. 2022-05-26 17:18:56 +08:00
王怡栋 532d006835 Merge branch 'sprint/193_hufangzhou_23006' into 'master'
* Fix bug #23006.

See merge request easycorp/zentaopms!3630
2022-05-26 09:15:58 +00:00
王怡栋 d08e7c06d4 Merge branch 'sprint/193_hufangzhou_upgrade' into 'master'
* Add the version correspondence.

See merge request easycorp/zentaopms!3620
2022-05-26 09:14:45 +00:00
王怡栋 65d94782aa Merge branch 'fixbug' into 'master'
* Fix bug #23001,23005.

See merge request easycorp/zentaopms!3628
2022-05-26 09:14:26 +00:00
孙广明 765ed6b21b Merge branch 'sprint/194_liumengyi_23000' into 'master'
* Fix bug #23000, #23007,#22995.

See merge request easycorp/zentaopms!3627
2022-05-26 09:11:09 +00:00
李玉春 03d7b05aa8 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!3631
2022-05-26 09:10:25 +00:00
liumengyi ab2294d0a4 * Fix bug #23007. 2022-05-26 17:08:15 +08:00
hufangzhou a3ac4fd428 * Fix bug #23006. 2022-05-26 17:04:27 +08:00
tanghucheng fa823c4c32 * Fix bug #23001,23005. 2022-05-26 08:44:23 +00:00
liumengyi 5df98760ae * Fix bug #22995. 2022-05-26 16:38:06 +08:00
hufangzhou 1b33d7a105 * Add the xuanxuan upgrade sql. 2022-05-26 16:32:02 +08:00
liumengyi fc838b26a5 * Fix bug #23000. 2022-05-26 16:09:46 +08:00
tianshujie 79d7990c21 * Fix bug #22994. 2022-05-26 16:00:47 +08:00
tianshujie 64b814cdd2 * Fix bug #22998. 2022-05-26 15:58:16 +08:00
孙广明 3c72f60129 Merge branch 'sprint/193_leiyong_task_54980' into 'master'
* Finish task#54980.

See merge request easycorp/zentaopms!3619
2022-05-26 07:49:20 +00:00
zhouxudong e70628fef0 * Finish task #54991. 2022-05-26 07:40:28 +00:00
李玉春 6ed6d29355 Merge branch 'sunhuawei_fixbug_22989' into 'master'
*Fix bug #22989.

See merge request easycorp/zentaopms!3623
2022-05-26 07:38:21 +00:00
孙华伟 8caf05257c *Fix bug #22989. 2022-05-26 15:27:54 +08:00
hufangzhou ee1772a8ce * Add the version correspondence. 2022-05-26 15:17:48 +08:00
zhouxudong 4b956437fd * Finisha task #54991. 2022-05-26 06:30:06 +00:00
王怡栋 558dcfde75 Merge branch 'sprint/daitingting_workflow_upgrade' into 'master'
Sprint/daitingting workflow upgrade

See merge request easycorp/zentaopms!3615
2022-05-26 06:25:59 +00:00
孙广明 c1997032f6 Merge branch 'sprint/194_tianshujie_fixbug' into 'master'
* Fix bug #22988.

See merge request easycorp/zentaopms!3616
2022-05-26 06:22:29 +00:00
tianshujie 50e9f82455 * Fix bug #22988. 2022-05-26 14:20:44 +08:00
李玉春 e119a3faf1 Merge branch 'sprint/194_tianshujie_fixbug' into 'master'
Sprint/194 tianshujie fixbug

See merge request easycorp/zentaopms!3611
2022-05-26 05:59:08 +00:00
tianshujie 8c2654c7d2 * Fix bug #22979. 2022-05-26 13:55:49 +08:00
daitingting 4cfd6c834b * Add break for this case. 2022-05-26 05:46:23 +00:00
孙广明 d6ae330c2e Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug for cli.

See merge request easycorp/zentaopms!3607
2022-05-26 05:45:59 +00:00
liyuchun fb771e6bc5 * Fix bug #22956. 2022-05-26 05:42:50 +00:00
daitingting 39d28cf70e * Process view fields when upgrade from biz7.0.beta1. 2022-05-26 05:39:30 +00:00
王怡栋 2bd55c1041 Merge branch 'sprint/193_hufangzhou_xuanxuan' into 'master'
* Change the xuanxuan version.

See merge request easycorp/zentaopms!3612
2022-05-26 05:06:04 +00:00
hufangzhou c0121f5940 * Change the xuanxuan version. 2022-05-26 13:05:05 +08:00
tianshujie eb3f621a92 * Modify the logic of the back button. 2022-05-26 11:41:09 +08:00
tianshujie b43eed49d0 * Modify the logic of the return button. 2022-05-26 11:39:23 +08:00
tianshujie c7aaf74e9d * Optimize the code. 2022-05-26 11:36:18 +08:00
tianshujie 017019f6af * Fix bug #22952,22979. 2022-05-26 11:35:47 +08:00
tianshujie 3e427c11a4 * Fix bug #22943. 2022-05-26 11:35:01 +08:00
孙广明 af5c034cde Merge branch 'sunhuawei_fixbug_22900' into 'master'
*Fix bug #22900.

See merge request easycorp/zentaopms!3610
2022-05-26 03:31:06 +00:00