Commit Graph
39550 Commits
Author SHA1 Message Date
李玉春 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
孙广明 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
王怡栋 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
王怡栋 401742cbfa Merge branch 'master_xieqiyu_54988' into 'master'
* Finish task#54988.

See merge request easycorp/zentaopms!3609
2022-05-26 03:27:08 +00:00
xieqiyu c33f911e59 * Modify review code. 2022-05-26 11:19:36 +08:00
孙华伟 ab396ef809 *Optimize the code. 2022-05-26 11:14:50 +08:00
孙华伟 c43322977f *Fix bug #22900. 2022-05-26 11:07:01 +08:00
王怡栋 9d920a20ac Merge branch 'sprint/193_hufangzhou_phpversion' into 'master'
* Change the php version 5.3 to 5.4.

See merge request easycorp/zentaopms!3608
2022-05-26 03:04:01 +00:00
xieqiyu fce652ac7c * Finish task#54988. 2022-05-26 11:03:24 +08:00
hufangzhou 54e3ff1198 * Change the php version 5.3 to 5.4. 2022-05-26 10:57:15 +08:00
王怡栋 fe8362dc59 Merge branch 'sgm_fixbug' into 'master'
* Fix bug #22944.

See merge request easycorp/zentaopms!3606
2022-05-26 02:50:15 +00:00
liyuchun 8a008bc17a * Fix bug for cli. 2022-05-26 02:48:59 +00:00
孙广明 e864362836 * Fix bug #22944. 2022-05-26 10:48:34 +08:00
孙广明 1364e3c5a3 Merge branch 'mayue_fix_bug#22905' into 'master'
* Fix bug #22905.

See merge request easycorp/zentaopms!3605
2022-05-26 02:38:51 +00:00
mayue b2f72aaeff * Fix bug #22905. 2022-05-26 10:16:45 +08:00
孙广明 414dfc75c7 Merge branch 'sprint/193_leiyong_bug_22913' into 'master'
* Fix bug#22912.

See merge request easycorp/zentaopms!3602
2022-05-26 02:12:44 +00:00
王怡栋 04c4ddeacd Merge branch 'sgm_casereviewer' into 'master'
* Fix bug #22944.

See merge request easycorp/zentaopms!3604
2022-05-26 02:00:22 +00:00
王怡栋 f0e738b2b6 Merge branch 'sprint/193_hufangzhou_package' into 'master'
* Add the new version.

See merge request easycorp/zentaopms!3603
2022-05-26 01:59:17 +00:00
hufangzhou 27ec156f88 * Add the new version. 2022-05-26 09:52:33 +08:00
leiyong 541e961882 * Fix bug#22912. 2022-05-26 01:50:41 +00:00
wangyidong d2cd6cc3b2 * adjust for add lite modules for flow. 2022-05-26 09:45:14 +08:00
孙广明 79ebf4a441 * Fix bug #22944. 2022-05-26 09:42:12 +08:00
孙广明 04eef93c0f Merge branch 'springt/195_zg_22897' into 'master'
* Fix bug#22897

See merge request easycorp/zentaopms!3597
2022-05-26 01:35:09 +00:00
wangyidong 22ee2ff226 * adjust for flow lang. 2022-05-26 09:28:14 +08:00
zhujinyong d31518fc2e * Set visions for api. 2022-05-26 09:02:59 +08:00
wangyidong 5c1e2c160d * adjust for flow. 2022-05-26 09:01:58 +08:00
wangyidong 2decbcc7c5 * adjust for flow. 2022-05-26 09:00:41 +08:00
李玉春 4a97f7bab4 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!3600
2022-05-26 00:29:58 +00:00
tianshujie f30883a442 * Delete extra blank lines. 2022-05-25 17:28:44 +08:00
tianshujie fe8758c4ca * Fix bug #22208. 2022-05-25 17:27:14 +08:00
王怡栋 4fd08b2b83 Merge branch 'sprint/193_hufangzhou_fillColor' into 'master'
* Fill the color for histogram.

See merge request easycorp/zentaopms!3596
2022-05-25 08:57:16 +00:00
王怡栋 af5c45b6cf Merge branch 'sprint/master_zhouxudong_22936' into 'master'
* Fix bug #22936.

See merge request easycorp/zentaopms!3599
2022-05-25 08:57:00 +00:00
zhouxudong 93c4c7bc5e * Fix bug #22936. 2022-05-25 08:52:09 +00:00
wangyidong 3159eb540a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-05-25 16:39:53 +08:00
wangyidong ddb25449d2 * code for task #54955. 2022-05-25 16:38:38 +08:00
李玉春 2ae9a39642 Merge branch 'sprint/194_liumengyi_fixbug' into 'master'
* Fix bug #22920.

See merge request easycorp/zentaopms!3598
2022-05-25 08:38:33 +00:00
liumengyi 5fad83c332 * Fix bug #22920. 2022-05-25 16:32:31 +08:00
zenggang 764c2bec29 * Fix bug#22897 2022-05-25 08:27:25 +00:00
tianshujie 41582fe513 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tianshujie_fixbug 2022-05-25 16:26:49 +08:00
hufangzhou 7a59184f96 * Fill the color for histogram. 2022-05-25 16:21:23 +08:00
李玉春 b41cdeb6f4 Merge branch 'sprint/194_tianshujie_55257' into 'master'
Sprint/194 tianshujie 55257

See merge request easycorp/zentaopms!3594
2022-05-25 08:08:26 +00:00