Commit Graph
33880 Commits
Author SHA1 Message Date
leiyong b6f5c18dc9 * Finish task#56933. 2022-06-14 07:56:43 +00:00
xieqiyu c03d486fab * Finish task#56919. 2022-06-14 15:55:48 +08:00
mayue 92c7801528 * Fix bug #23184. 2022-06-14 15:44:54 +08:00
王怡栋 ee4ce60394 Merge branch 'sprint/204_liumengyi_23648' into 'master'
* Fix bug #23648.

See merge request easycorp/zentaopms!3912
2022-06-14 07:26:14 +00:00
王怡栋 71fb547445 Merge branch 'master_xieqiyu_56922' into 'master'
* Finish task#56922.

See merge request easycorp/zentaopms!3910
2022-06-14 07:19:42 +00:00
王怡栋 dce5aa0a23 Merge branch 'sprint/master_zhouxudong_56915' into 'master'
Sprint/master zhouxudong 56915

See merge request easycorp/zentaopms!3909
2022-06-14 07:18:50 +00:00
liumengyi 5ad98df2ca * Fix bug #23648. 2022-06-14 15:17:57 +08:00
王怡栋 fd8c9b0f9a Merge branch 'sprint/master_tanghucheng' into 'master'
* Finish story #33374.

See merge request easycorp/zentaopms!3911
2022-06-14 07:14:07 +00:00
tanghucheng 1f1b79948a * Finish story #33374. 2022-06-14 15:03:36 +08:00
xieqiyu 38dad8467f * Finish task#56922. 2022-06-14 15:00:08 +08:00
孙广明 dbb1ccc413 Merge branch 'sprint/203_zg_56558' into 'master'
* Finish task#56558

See merge request easycorp/zentaopms!3892
2022-06-14 06:58:39 +00:00
孙广明 7d37afcd4f Merge branch 'sprint/203_zg_57156' into 'master'
* Finish task#57156,57159

See merge request easycorp/zentaopms!3905
2022-06-14 06:58:22 +00:00
zenggang ea2280da59 * Adjust code 2022-06-14 06:56:01 +00:00
sunjun 74726de8c1 sprint_204_57093 2022-06-14 06:48:24 +00:00
liumengyi 6aaf4f6308 * Fix bug for task #57090. 2022-06-14 14:39:55 +08:00
zhouxudong 1ad55fdd08 * Finish task #56915. 2022-06-14 06:39:25 +00:00
zenggang 18449b6c13 * Finish task #57159 2022-06-14 06:32:41 +00:00
王怡栋 d682c68483 Merge branch 'master_xieqiyu_56931' into 'master'
* Finish task#56931.

See merge request easycorp/zentaopms!3906
2022-06-14 06:30:53 +00:00
王怡栋 a8e7dcf2a3 Merge branch 'sprint/204_liumengyi_57090' into 'master'
* Fix bug #23648, #23650, and finish task #57090.

See merge request easycorp/zentaopms!3904
2022-06-14 06:29:34 +00:00
王怡栋 785d7ff2e2 Merge branch 'master_xieqiyu_56913' into 'master'
Master xieqiyu 56913

See merge request easycorp/zentaopms!3903
2022-06-14 06:27:37 +00:00
王怡栋 fa81f27748 Merge branch 'sprint/201_tianshujie_23663' into 'master'
* Fix bug #23663.

See merge request easycorp/zentaopms!3902
2022-06-14 06:25:45 +00:00
王怡栋 bfc378eba2 Merge branch 'master_xieqiyu_56935' into 'master'
* Finish task#56935.

See merge request easycorp/zentaopms!3899
2022-06-14 06:24:47 +00:00
王怡栋 f70f0c9f97 Merge branch 'sprint/master_zhouxudong_56910' into 'master'
Sprint/master zhouxudong 56910

See merge request easycorp/zentaopms!3898
2022-06-14 06:23:20 +00:00
xieqiyu 8814f0f6dd * Finish task#56931. 2022-06-14 14:12:57 +08:00
zenggang cc49cbe439 * Finish task#57156 2022-06-14 06:03:55 +00:00
liumengyi d1a44ab424 * Finish task #57090. 2022-06-14 13:58:18 +08:00
liumengyi 2d4f3be98a * Finish task #57090. 2022-06-14 13:56:38 +08:00
tianshujie 1eda1081d1 * Fix bug #23663. 2022-06-14 13:49:07 +08:00
liumengyi 347fcb16c7 * Fix bug #23648, #23650. 2022-06-14 13:47:33 +08:00
tianshujie ed2664f731 * Fix bug #23663. 2022-06-14 13:46:38 +08:00
xieqiyu a384279f28 * Finish task#56911. 2022-06-14 13:45:45 +08:00
孙广明 0397a7b0b5 Merge branch 'sprint/203_mayue_bug#23410' into 'master'
* Fix bug #23410.

See merge request easycorp/zentaopms!3897
2022-06-14 05:35:39 +00:00
xieqiyu 030d826624 * Finish task#56912. 2022-06-14 13:34:49 +08:00
xieqiyu d343298490 * Finish task#56913. 2022-06-14 13:28:42 +08:00
王怡栋 f5788a4535 Merge branch 'sprint/204_tianshujie_57098' into 'master'
Sprint/204 tianshujie 57098

See merge request easycorp/zentaopms!3900
2022-06-14 05:28:03 +00:00
tianshujie 3d9012cfca * Finish task #57098. 2022-06-14 13:18:52 +08:00
dingyongliang 66828037e0 * hide nav in electron zentao. 2022-06-14 13:12:41 +08:00
xieqiyu 254dbf58e5 * Finish task#56935. 2022-06-14 13:10:19 +08:00
sunjun 3ab3059ed3 sprint_204_57097 2022-06-14 04:07:06 +00:00
mayue a70fd10f87 * Fix bug #23410. 2022-06-14 11:17:25 +08:00
zhouxudong 50571ec217 * Finish task #56915. 2022-06-14 03:13:14 +00:00
孙广明 da2b704d31 * Finish task #57157. 2022-06-14 10:46:29 +08:00
zhouxudong c16b1fd1c3 * Finish task #56910. 2022-06-14 02:44:20 +00:00
孙广明 d9e036ba0c Merge branch 'sgm_56629' into 'master'
* Add en lang.

See merge request easycorp/zentaopms!3894
2022-06-14 02:26:04 +00:00
孙广明 e287ded97e * Add en lang. 2022-06-14 10:25:33 +08:00
王怡栋 89506d91c6 Merge branch 'sgm_56629' into 'master'
* Finish task #56629.

See merge request easycorp/zentaopms!3893
2022-06-14 02:24:12 +00:00
孙广明 089662bd5e * Finish task #56629. 2022-06-14 10:20:29 +08:00
王怡栋 ae1bc3cfc1 Merge branch 'sprint/master_zhouxudong_23554' into 'master'
Sprint/master zhouxudong 23554

See merge request easycorp/zentaopms!3886
2022-06-14 02:00:12 +00:00
zhouxudong aedd5764a9 * Finish task #23554. 2022-06-14 01:58:37 +00:00
tianshujie a6b47e84a9 * Finish task #57098. 2022-06-14 09:55:56 +08:00