Commit Graph
42333 Commits
Author SHA1 Message Date
hufangzhou 9e54c0b55c * Change the if statement to toggleClass. 2022-07-20 14:27:08 +08:00
hufangzhou fab8fedf10 * Adjust the judgment condition to a configuration item. 2022-07-20 14:15:43 +08:00
hufangzhou 1085813b49 * Adjust the tips of required fields. 2022-07-20 13:33:52 +08:00
hufangzhou d7c33d2859 * Adjust the height of basic info box. 2022-07-20 10:27:37 +08:00
hufangzhou 1dcf2dcb2c * Code for task #59750. 2022-07-20 10:13:21 +08:00
王怡栋 70f12a35da Merge branch 'sprint/217_tianshujie_code' into 'master'
* Finish task #61177.

See merge request easycorp/zentaopms!4604
2022-07-20 01:46:08 +00:00
王怡栋 895f8136ec Merge branch 'cyy_mr' into 'master'
* Modify mr review log.

See merge request easycorp/zentaopms!4602
2022-07-20 01:45:46 +00:00
王怡栋 c904507658 Merge branch 'sprint/master_zhouxudong_61110' into 'master'
* Finish task #61110.

See merge request easycorp/zentaopms!4603
2022-07-20 01:45:32 +00:00
tianshujie d225cab26b * Remove spaces. 2022-07-20 09:45:12 +08:00
tianshujie 72ac19d156 * Finish task #61177. 2022-07-20 09:42:37 +08:00
孙广明 9f1847d55b * Code for code error. 2022-07-20 09:35:30 +08:00
zhouxudong 6884f83b21 * Finish task #61110. 2022-07-20 01:31:31 +00:00
caoyanyi 3de9a41c2b * Modify mr review log. 2022-07-20 09:25:43 +08:00
王怡栋 1e14279144 Merge branch 'cyy_mr' into 'master'
Cyy mr

See merge request easycorp/zentaopms!4601
2022-07-20 01:16:22 +00:00
王怡栋 80c3b67ee1 Merge branch 'sprint/tianshujie_code' into 'master'
Sprint/tianshujie code

See merge request easycorp/zentaopms!4600
2022-07-20 01:15:46 +00:00
caoyanyi 1b6f3e6a23 * Adjust codes. 2022-07-20 09:06:31 +08:00
tianshujie e19b245d2a * Finish task #61177. 2022-07-20 08:56:53 +08:00
tianshujie 248ea09a59 * Fix bug #25450. 2022-07-20 08:51:50 +08:00
tianshujie 53e12e967c * Finish task #61181. 2022-07-20 08:48:51 +08:00
王怡栋 c3cd219d3c Merge branch 'sprint/217_liumengyi_25457' into 'master'
* Fix bug #25457.

See merge request easycorp/zentaopms!4599
2022-07-20 00:48:07 +00:00
liumengyi 5b4bc9ab8f * Fix bug #25457. 2022-07-20 08:40:30 +08:00
tianshujie f0dec448ce * Finish task #61177. 2022-07-20 08:36:04 +08:00
王怡栋 9abacbd0c9 Merge branch 'sprint/master_zhouxudong_61110' into 'master'
Sprint/master zhouxudong 61110

See merge request easycorp/zentaopms!4598
2022-07-20 00:29:16 +00:00
王怡栋 3120ef2aa2 Merge branch 'zenops_38' into 'master'
Zenops 38

See merge request easycorp/zentaopms!4597
2022-07-20 00:28:11 +00:00
caoyanyi 07465a327d * Modify merge request view. 2022-07-19 17:04:12 +08:00
tianshujie 35537ff9db * Fix bug #25453. 2022-07-19 16:33:03 +08:00
wangyidong 4601a6966d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-07-19 15:36:20 +08:00
wangyidong fbbbd58cbc * code for task #61200. 2022-07-19 15:36:03 +08:00
王怡栋 96d0f549da Merge branch 'sprint/217_liumengyi_61174' into 'master'
* Finish task #61174.

See merge request easycorp/zentaopms!4595
2022-07-19 07:33:30 +00:00
liumengyi b58bc83616 * Optimize for task #61174, #61175. 2022-07-19 15:32:13 +08:00
tianshujie e8603eef32 * Finish task #61181. 2022-07-19 15:25:43 +08:00
tianshujie 468ce6bd6c * Fix bug #25444. 2022-07-19 15:14:39 +08:00
tianshujie fe276e667f * Fix bug #25437. 2022-07-19 14:54:14 +08:00
tianshujie 237e184998 * Finish task #61177. 2022-07-19 14:38:19 +08:00
tianshujie 896ac04352 * Finish task #61177. 2022-07-19 14:34:54 +08:00
王怡栋 d93067ea8d Merge branch 'sprint/wangzemei/bug24273' into 'master'
* Fix bug #24273

See merge request easycorp/zentaopms!4596
2022-07-19 06:01:25 +00:00
caoyanyi b3a83fc407 * Modify edit merge request for gitea. 2022-07-19 14:00:59 +08:00
tianshujie 7eed8e4a2b * Finish task #61180. 2022-07-19 13:52:40 +08:00
liumengyi 0aaae21a73 * Optimize code for task#61174. 2022-07-19 13:52:34 +08:00
wangzemei 7e8e91659c * Fix bug #24273 2022-07-19 05:44:09 +00:00
wangyidong a61f6a9cc1 * code for task #61189. 2022-07-19 13:34:38 +08:00
tianshujie 7791a30013 * Finish task #61177. 2022-07-19 13:32:03 +08:00
tianshujie fc58365ce9 * Finish task #61179. 2022-07-19 13:31:16 +08:00
wangyidong f8fbd29b08 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-07-19 13:10:42 +08:00
wangyidong 837c8f7ec2 * code for task #61188. 2022-07-19 13:10:26 +08:00
zhouxudong da232983e5 * Finish task #61110. 2022-07-19 03:06:00 +00:00
caoyanyi 8163199cf1 * Modify merge request for gitea. 2022-07-19 10:56:04 +08:00
zhouxudong fd9c465df7 * Finish task #61110. 2022-07-19 02:21:10 +00:00
liumengyi cd4d9d2a6e * Optimize code for task #61174. 2022-07-19 09:52:15 +08:00
王怡栋 5a951491fe Merge branch 'sprint/217_zg' into 'master'
* Finish task#61184,61183,61172

See merge request easycorp/zentaopms!4593
2022-07-19 01:52:12 +00:00