Commit Graph
32641 Commits
Author SHA1 Message Date
zenggang fe5ec04749 * Code for task#55851 2022-06-02 05:22:12 +00:00
孙广明 f79844fd99 * Merge create user btn. 2022-06-01 15:40:49 +08:00
孙广明 358ff4bd2f * Fix doc bug. 2022-06-01 15:05:43 +08:00
王怡栋 cbad6ae17c Merge branch 'sgm_55844' into 'zentaopms_198'
* Finish task #55844.

See merge request easycorp/zentaopms!3683
2022-06-01 06:30:25 +00:00
孙广明 fba70b09d5 * Remove unused code. 2022-06-01 14:29:08 +08:00
孙广明 226ea6ef16 * Finish task #55844. 2022-06-01 14:25:59 +08:00
孙广明 260a46cab0 Merge branch 'sprint/198_mayue_bug#23086' into 'zentaopms_198'
Sprint/198 mayue bug#23086

See merge request easycorp/zentaopms!3682
2022-06-01 06:09:18 +00:00
mayue 38bdcc9ea4 * Optimize code. 2022-06-01 11:29:41 +08:00
mayue 3c259a09d1 * Fix bug #23086. 2022-06-01 11:20:16 +08:00
孙广明 f4bbddcef6 * Finish task #55845. 2022-06-01 11:20:01 +08:00
孙广明 dad79f6652 Merge branch 'group_zg_unit' into 'zentaopms_195'
Group unit

See merge request easycorp/zentaopms!3647
2022-05-29 06:02:36 +00:00
mayue 106bd7b3e7 * Fix issue #654. 2022-05-27 15:58:57 +08:00
zenggang bb0cd23f51 * Adjust code 2022-05-27 07:33:26 +00:00
孙广明 d6017ab11e * Plan module order by path. 2022-05-27 08:47:19 +08:00
mayue 4efbde2805 * Fix bug #22972. 2022-05-26 14:49:29 +08:00
zenggang c1f648d22a * Fix bug#22957 2022-05-26 05:36:53 +00: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
李玉春 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
zhouxudong 93c4c7bc5e * Fix bug #22936. 2022-05-25 08:52:09 +00: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
王怡栋 14ece79b3e Merge branch 'spring/master_zhouxudong_54470' into 'master'
* Finish task #54470.

See merge request easycorp/zentaopms!3547
2022-05-25 08:04:57 +00:00
王怡栋 c39f1f8892 Merge branch 'sprint/master_zhouxudong_54991' into 'master'
* Finish task #54991.

See merge request easycorp/zentaopms!3592
2022-05-25 08:04:31 +00:00
zhouxudong b1ac09ae53 * Finish task #54991. 2022-05-25 08:01:10 +00:00
王怡栋 8f8ac9849b Merge branch 'sprint/189_package_lanzongjun' into 'master'
* fix bug #54940

See merge request easycorp/zentaopms!3595
2022-05-25 07:58:51 +00:00
lanzongjun 36010b797f * fix bug #54940 2022-05-25 15:58:26 +08:00
zhouxudong fcf8218569 * Finish task #54470. 2022-05-25 07:57:57 +00:00
lanzongjun 0a84e5fb81 * fix bug #54940 2022-05-25 15:51:48 +08:00
李玉春 d8846c045e Merge branch 'sprint/194_liumengyi_fixbug' into 'master'
* Fix bug #22664.

See merge request easycorp/zentaopms!3593
2022-05-25 07:44:12 +00:00
liumengyi 673c192017 * Fix bug #22664. 2022-05-25 15:41:27 +08:00
王怡栋 b4646bcf9c Merge branch 'sprint/master_zhouxudong_54998' into 'master'
* Finish task #54998.

See merge request easycorp/zentaopms!3591
2022-05-25 07:17:49 +00:00
zhouxudong 049c774680 * Finish task #54983. 2022-05-25 07:12:30 +00:00
王怡栋 601272cd59 Merge branch 'sprint/193_hufangzhou_54994' into 'master'
* Finish task #54994.

See merge request easycorp/zentaopms!3580
2022-05-25 07:10:56 +00:00
王怡栋 7466f08e23 Merge branch 'sprint/193_hufangzhou_54996' into 'master'
* Finish task #54996.

See merge request easycorp/zentaopms!3581
2022-05-25 07:09:51 +00:00
王怡栋 137085feed Merge branch 'sprint/193_hufangzhou_54990' into 'master'
* Finish task #54990.

See merge request easycorp/zentaopms!3585
2022-05-25 07:09:26 +00:00
王怡栋 b68c2e6a80 Merge branch 'sprint/193_hufangzhou_644' into 'master'
* Resolve issue #644.

See merge request easycorp/zentaopms!3589
2022-05-25 07:09:06 +00:00
王怡栋 95b32771fa Merge branch 'sgm_task55323' into 'master'
* Fix bug #55323.

See merge request easycorp/zentaopms!3590
2022-05-25 07:03:22 +00:00
孙广明 ececdba8df * Fix bug #55323. 2022-05-25 14:46:59 +08:00
tianshujie e1299312d9 * Fix bug #22862. 2022-05-25 14:39:02 +08:00
tianshujie 8e3068d9b5 * Finish task #55257. 2022-05-25 14:26:21 +08:00
zhouxudong 7d5b4616bb * Finish task #54991. 2022-05-25 05:53:27 +00:00
孙广明 2c60c73f47 Merge branch 'sprint/195_zg_55147' into 'master'
* Finish task#55174,55172

See merge request easycorp/zentaopms!3573
2022-05-25 05:51:37 +00:00