Commit Graph
45859 Commits
Author SHA1 Message Date
wangzemei a2fb82eff4 * modify radas radius 2022-10-20 16:45:27 +08:00
wangzemei e36bb94111 * fix max 2022-10-20 16:30:01 +08:00
wangzemei fc64618c6c * replace max 2022-10-20 15:55:46 +08:00
wangzemei 8c0a0a8dbf * modify style 2022-10-20 14:57:53 +08:00
wangzemei 4924866a4e * replace echarts.timeline.js 2022-10-20 13:43:23 +08:00
wangzemei d6d3ecf886 * modify style 2022-10-20 09:22:53 +08:00
wangzemei 5974c2bb13 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_72350 2022-10-20 09:22:29 +08:00
王怡栋 5bed328848 Merge branch 'master_feedback_1133' into 'master'
* Adjust code format.

See merge request easycorp/zentaopms!5815
2022-10-20 00:30:53 +00:00
wangzemei 244f9ac4b2 * finish task 2022-10-19 21:26:24 +08:00
liuhong f756b892d6 * Adjust code format. 2022-10-19 12:53:54 +00:00
孙广明 563f523f9c Merge branch 'sprint/247_tianshujie_fixbug' into 'master'
* Fix bug #28499.

See merge request easycorp/zentaopms!5810
2022-10-19 09:04:51 +00:00
李玉春 45db98047c Merge branch 'cyy_bug' into 'master'
* Fix bug #28128.

See merge request easycorp/zentaopms!5814
2022-10-19 09:03:36 +00:00
李玉春 4aeb260282 Merge branch 'sprint/247_wangzemei_28395' into 'master'
* Solve width calculation problems

See merge request easycorp/zentaopms!5807
2022-10-19 09:02:52 +00:00
曹延义 e16a4eb765 * Fix bug #28128. 2022-10-19 17:01:56 +08:00
wangzemei 18226622ab show imgs 2022-10-19 17:01:31 +08:00
孙广明 ec22de682f Merge branch 'biz13_mayue_bug#28337' into 'master'
* Add the status column of Kanban import ticket.

See merge request easycorp/zentaopms!5812
2022-10-19 08:59:05 +00:00
王怡栋 7ed78a0b05 Merge branch 'master_feedback_420' into 'master'
* Adjust the code format.

See merge request easycorp/zentaopms!5806
2022-10-19 08:57:34 +00:00
王怡栋 e3f2bce7ca Merge branch 'tanghucheng_feedback_module' into 'master'
* Fix bug #28684.

See merge request easycorp/zentaopms!5811
2022-10-19 08:55:39 +00:00
mayue 06e4a05403 * Add the status column of Kanban import ticket. 2022-10-19 16:36:01 +08:00
tanghucheng c0a9e98cd1 * Fix bug #28684,28680. 2022-10-19 15:42:46 +08:00
tianshujie 80f9e9ab61 * Fix bug #28499. 2022-10-19 15:34:54 +08:00
wangzemei 062e796b01 * show echarts autoPlay 2022-10-19 15:27:14 +08:00
wangzemei 700f08b5d5 * show echarts autoPlay 2022-10-19 15:24:40 +08:00
孙广明 af6634eaad Merge branch 'biz13_mayue_bug#28666' into 'master'
* Fix bug #28666.

See merge request easycorp/zentaopms!5809
2022-10-19 07:17:43 +00:00
孙广明 7746006ecf Merge branch 'sprint/hufangzhou_sql' into 'master'
* Adjust the type of fields.

See merge request easycorp/zentaopms!5808
2022-10-19 07:17:29 +00:00
mayue 1221260f0b * Fix bug #28666. 2022-10-19 15:13:16 +08:00
hufangzhou ee0a444bde * Adjust the type of fields. 2022-10-19 06:48:45 +00:00
wangzemei 84f1b64aae * remove useless class 2022-10-19 14:35:12 +08:00
wangzemei 25f8023fef * Solve width calculation problems 2022-10-19 14:31:55 +08:00
liuhong 6133c2ca58 * Adjust the code format. 2022-10-19 06:25:39 +00:00
王怡栋 171ad26855 Merge branch 'master_feedback_1133' into 'master'
* Adjust the code format.

See merge request easycorp/zentaopms!5805
2022-10-19 06:21:49 +00:00
liuhong a7765cfae8 * Adjust the code format. 2022-10-19 06:13:35 +00:00
王怡栋 cb645f4d50 Merge branch 'tanghucheng_feedback_module' into 'master'
* Fix bug #28639.

See merge request easycorp/zentaopms!5801
2022-10-19 06:11:24 +00:00
王怡栋 5b4be9a502 Merge branch 'sprint/hufangzhou_langItem' into 'master'
* Added empty row for alignment.

See merge request easycorp/zentaopms!5802
2022-10-19 06:10:49 +00:00
hufangzhou 10c07b964f * Added empty row for alignment. 2022-10-19 06:06:26 +00:00
tanghucheng 14f82baf7e * Fix bug #28639. 2022-10-19 13:57:00 +08:00
王怡栋 37671824c5 Merge branch 'sprint/hufangzhou_newVersion' into 'master'
* Add the new version.

See merge request easycorp/zentaopms!5798
2022-10-19 05:49:17 +00:00
hufangzhou d3f7df5518 * Add the new version. 2022-10-19 05:41:40 +00:00
王怡栋 cdb458bb9f Merge branch 'master_feedback_1133' into 'master'
*Fix feedback #1133 for waterfall project choose stagefilteri with Related pages.

See merge request easycorp/zentaopms!5796
2022-10-19 05:29:12 +00:00
王怡栋 7497d48e95 Merge branch 'tanghucheng_feedback_module' into 'master'
* Fix bug #28647.

See merge request easycorp/zentaopms!5793
2022-10-19 05:18:05 +00:00
李玉春 a18bb50ef9 Merge branch 'sprint/247_tianshujie_fixbug' into 'master'
* Fixed maintenance task team style issues.

See merge request easycorp/zentaopms!5795
2022-10-19 05:13:36 +00:00
liuhong db48df1bb5 *Fix feedback #1133 for waterfall project choose stagefilteri with Related pages. 2022-10-19 05:09:01 +00:00
李玉春 ce25b34848 Merge branch 'sprint/247_fix_wangzemei' into 'master'
* fix 28395 28640 28406

See merge request easycorp/zentaopms!5794
2022-10-19 05:02:08 +00:00
tianshujie 056358363d * Fixed maintenance task team style issues. 2022-10-19 11:56:03 +08:00
tanghucheng 30bf3b8d3d * Add language for tree. 2022-10-19 11:25:31 +08:00
wangzemei 268feebd44 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_72350 2022-10-19 11:10:09 +08:00
wangzemei 68f702d9ef * fix 28395 28640 28406 2022-10-19 11:07:04 +08:00
tanghucheng 7959557283 * Fix bug #28647. 2022-10-19 11:05:35 +08:00
wangzemei 5b1f27fb47 * stash modify 2022-10-19 10:15:58 +08:00
wangyidong 07699b5ea4 Merge branch 'tanghucheng_feedback_module' 2022-10-19 09:36:42 +08:00