Commit Graph
46264 Commits
Author SHA1 Message Date
liumengyi a38461a20e * Fix bug for manage chart group. 2022-11-06 16:03:14 +08:00
孙广明 aadcbf0376 Merge branch 'sprint/biz17_liumengyi_fixbug' into 'sprint/biz17'
* Fix bug.

See merge request easycorp/zentaopms!6013
2022-11-03 05:08:12 +00:00
liumengyi ddae3dce44 * Fix bug. 2022-11-03 11:17:29 +08:00
孙广明 0dd690733f Merge branch 'sprint/biz17_liumengyi_codereview' into 'sprint/biz17'
* Optimize code after code review.

See merge request easycorp/zentaopms!5982
2022-11-02 05:32:06 +00:00
liumengyi f7af6deaa6 * Optimize code after code review. 2022-11-02 13:27:31 +08:00
李玉春 00e0b271e1 Merge branch 'sprint/biz17_liumengyi_74322' into 'sprint/biz17'
Sprint/biz17 liumengyi 74322

See merge request easycorp/zentaopms!5974
2022-11-01 08:27:51 +00:00
liumengyi c5e5fdceb9 Merge branch 'sprint/biz17_liumengyi_74322' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/biz17_liumengyi_74322 2022-11-01 16:25:03 +08:00
liumengyi 92054f16ec * Fix bug for task #74322. 2022-11-01 16:24:06 +08:00
Yagami a905707e33 Merge branch 'sprint/biz17_liumengyi_74322' into sprint/biz17 2022-11-01 15:03:15 +08:00
孙广明 d3c9becc62 Merge branch 'sprint/biz17' into 'sprint/biz17_liumengyi_74322'
# Conflicts:
#   db/update17.7.sql
2022-11-01 07:02:52 +00:00
liumengyi 7fba5b1b82 * Fix bug. 2022-11-01 14:47:24 +08:00
孙广明 991f2bfa7c Merge branch 'sprint/scx_dimension' into 'sprint/biz17'
Sprint/scx dimension

See merge request easycorp/zentaopms!5964
2022-11-01 06:46:50 +00:00
liumengyi d92a58f3df * Optimize code for task #74322, #74326. 2022-11-01 14:39:16 +08:00
liumengyi ca70d4d63c * Finish task #74322, #74326. 2022-11-01 14:20:57 +08:00
宋辰轩 d93ac61f69 * Add sql to zentao. 2022-11-01 13:34:29 +08:00
宋辰轩 c599d7fc18 * Delete unused file. 2022-11-01 13:30:51 +08:00
宋辰轩 c0ef49273f * Add db and define to 17-7 2022-11-01 13:30:03 +08:00
孙广明 ff132b7deb Merge branch 'sprint/zentaobiz16' into 'master'
* Code for task#73360,#73366,#73363.

See merge request easycorp/zentaopms!5952
2022-10-31 06:26:51 +00:00
王怡栋 afba980ce4 Merge branch 'bug_29103' into 'master'
* Fix bug #29103

See merge request easycorp/zentaopms!5946
2022-10-31 06:02:16 +00:00
王怡栋 d485d929b1 Merge branch 'master_feedback_1301' into 'master'
* Resolved feedback #1301.

See merge request easycorp/zentaopms!5945
2022-10-31 06:01:52 +00:00
王怡栋 9b02395845 Merge branch 'master_bug_26228' into 'master'
* Fix bug #26228.

See merge request easycorp/zentaopms!5943
2022-10-31 05:58:26 +00:00
王怡栋 f65c403dc0 Merge branch 'master_xieqiyu_29013' into 'master'
* Fix bug#29013.

See merge request easycorp/zentaopms!5942
2022-10-31 05:56:24 +00:00
王怡栋 37433b6635 Merge branch 'bug_29089' into 'master'
* Fix bug #29089

See merge request easycorp/zentaopms!5940
2022-10-31 05:42:48 +00:00
王怡栋 2da92b6423 Merge branch 'feedback_zhouxin_36186' into 'master'
* Resolve feedback #197.

See merge request easycorp/zentaopms!5950
2022-10-31 05:42:00 +00:00
zhouxin cd5415309e * Resolve feedback #36186. 2022-10-31 13:21:00 +08:00
李玉春 fa39994e50 Merge branch 'cyy_bug' into 'master'
* Modify pri style.

See merge request easycorp/zentaopms!5936
2022-10-31 05:15:57 +00:00
zenggang 1af29a6aa6 * Fix bug #29103 2022-10-31 02:18:56 +00:00
liuhong 67ce1a86eb * Resolved feedback #1301. 2022-10-31 01:49:23 +00:00
liuhong 0e81c1cf78 * Fix bug #26228. 2022-10-30 04:39:47 +00:00
xieqiyu f7a84e569b * Fix bug#29013. 2022-10-29 05:47:34 +00:00
caoyanyi 7e3fa55506 * Adjust code. 2022-10-28 17:17:50 +08:00
李玉春 0d7e25c83d Merge branch 'sprint/253_tianshujie_fixbug' into 'master'
Sprint/253 tianshujie fixbug

See merge request easycorp/zentaopms!5938
2022-10-28 09:11:40 +00:00
zenggang a4a217c64d * Fix bug #29089 2022-10-28 08:34:37 +00:00
朱金勇 9a301cff93 Merge branch 'sprint/fix-checkPriv' into 'master'
* Fix bug of unauthorized users.

See merge request easycorp/zentaopms!5932
2022-10-28 08:16:51 +00:00
鲁飞 b1cb5a798e * Fix bug of unauthorized users. 2022-10-28 08:16:50 +00:00
tianshujie 2bf41732ef * Fix bug #29000. 2022-10-28 16:08:40 +08:00
tianshujie 5fdc7eff1a Modify the maintenance task team action button style. 2022-10-28 16:05:22 +08:00
tianshujie 278c4779f6 * Modify the list of issues in the block to be processed. 2022-10-28 15:59:17 +08:00
caoyanyi b81056c6ea * Modify pri style. 2022-10-28 15:58:06 +08:00
孙广明 8389191e25 Merge branch 'sprint/253_tianshujie_73746' into 'master'
* Fix bug #29035.

See merge request easycorp/zentaopms!5934
2022-10-28 07:39:11 +00:00
tianshujie fb546c1176 * Fix bug #29035. 2022-10-28 15:17:08 +08:00
王怡栋 f03d771f33 Merge branch 'master_bug_28882' into 'master'
* Fix bug #28882.

See merge request easycorp/zentaopms!5929
2022-10-28 03:28:35 +00:00
王怡栋 85d92fa65b Merge branch 'master_bug_28884' into 'master'
* Fix bug #28884.

See merge request easycorp/zentaopms!5928
2022-10-28 03:28:05 +00:00
王怡栋 af1c82ddb1 Merge branch 'master_bug_28949' into 'master'
*Fix bug #28949.

See merge request easycorp/zentaopms!5925
2022-10-28 03:27:38 +00:00
李玉春 26559522bb Merge branch 'cyy_bug' into 'master'
* Modify kanban severity style.

See merge request easycorp/zentaopms!5930
2022-10-28 03:15:37 +00:00
李玉春 e5ddf25385 Merge branch 'sprint/253_tianshujie_fixbug' into 'master'
Sprint/253 tianshujie fixbug

See merge request easycorp/zentaopms!5927
2022-10-28 03:15:24 +00:00
caoyanyi a6cdf94502 * Modify kanban severity style. 2022-10-28 11:00:42 +08:00
liuhong 67f6c5c346 * Fix bug #28882. 2022-10-28 02:51:28 +00:00
tianshujie 73dd27e207 * Delete unnecessary Spaces. 2022-10-28 10:46:21 +08:00
李玉春 773171f523 Merge branch 'cyy_bug' into 'master'
Cyy bug

See merge request easycorp/zentaopms!5924
2022-10-28 02:43:33 +00:00