Commit Graph
26496 Commits
Author SHA1 Message Date
朱金勇 5ee11088b8 Merge branch 'sprint/176_songchenxuan_45539' into 'master'
Sprint/176 songchenxuan 45539

See merge request easycorp/zentaopms!870
2021-12-10 06:04:23 +00:00
songchenxuan 30a8d7acb0 *Finish task #45539. 2021-12-10 11:00:04 +08:00
朱金勇 c5bce17ef3 Merge branch 'sprint/176_songchenxuan_45537' into 'master'
*Finish task #45337.

See merge request easycorp/zentaopms!871
2021-12-10 02:45:06 +00:00
孙广明 07699008e8 * Fix bug. 2021-12-09 17:16:30 +08:00
hufangzhou ab5b5bdf87 * Fix bug #17311. 2021-12-09 16:54:30 +08:00
朱金勇 0a16828af9 Merge branch 'sprint/xieqiyu_fixbug_build' into 'master'
* Update project linked branch.

See merge request easycorp/zentaopms!853
2021-12-09 07:42:17 +00:00
xieqiyu dd480f9ced * When upgrading, the project and execution add branches of stories. 2021-12-09 15:26:37 +08:00
xieqiyu 1c89ca369b * Update project linked branch. 2021-12-09 14:14:26 +08:00
zhujinyong 2d91f6d395 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-09 13:39:52 +08:00
zhujinyong e0217a1569 * Fix bugs of repo api. 2021-12-09 13:39:37 +08:00
hufangzhou 44a80b866d * Fix bug #17295. 2021-12-09 11:24:35 +08:00
李玉春 8a8e3d40e8 Merge branch 'sprint/xieqiyu_fixbug_build' into 'master'
* Fix bug: edit build error.

See merge request easycorp/zentaopms!850
2021-12-09 03:19:40 +00:00
xieqiyu e13665ecfb * Fix bug: edit build error. 2021-12-09 11:18:10 +08:00
王怡栋 2eb63dd763 Merge branch '170_package_bug' into 'master'
* Fix bug #16639,#16599.

See merge request easycorp/zentaopms!849
2021-12-09 03:06:58 +00:00
李玉春 b72f016efe Merge branch 'sprint/xieqiyu_fixbug_17251' into 'master'
* Fix bug#17251.

See merge request easycorp/zentaopms!848
2021-12-09 02:29:02 +00:00
xieqiyu 7a482c5f6a * Fix bug#17251. 2021-12-09 10:25:23 +08:00
hufangzhou 73b43980eb * Fix an error for lang item. 2021-12-09 10:12:08 +08:00
李玉春 ce68565c54 Merge branch 'sprint/174_tianshujie_17173' into 'master'
* Fix bug #17173.

See merge request easycorp/zentaopms!846
2021-12-09 02:09:17 +00:00
孙广明 10fd278b2b Merge branch 'sprint/174_hufangzhou_16792' into 'master'
* Fix bug #16792.

See merge request easycorp/zentaopms!845
2021-12-09 02:05:41 +00:00
tianshujie 9818fe17de * Fix bug #17173. 2021-12-09 10:04:46 +08:00
hufangzhou 7f94a46592 * Fix bug #16792. 2021-12-09 09:53:54 +08:00
hufangzhou ebcc470de1 * Fix bug #17276. 2021-12-08 17:52:19 +08:00
李玉春 dc2ea56141 Merge branch 'sprint/174_hufangzhou_17269' into 'master'
* Fix bug #17269, bug #16975.

See merge request easycorp/zentaopms!841
2021-12-08 09:26:39 +00:00
hufangzhou 25961617b3 * Adjust the code. 2021-12-08 17:26:12 +08:00
hufangzhou 68a534b137 * Fix bug #17269, bug #16975. 2021-12-08 17:16:22 +08:00
tianshujie a2355212ad * Fix bug #17272. 2021-12-08 17:08:10 +08:00
李玉春 b81aeb3d2a Merge branch 'sprint/174_tianshujie_17259' into 'master'
* Fix bug #17259.

See merge request easycorp/zentaopms!839
2021-12-08 09:00:26 +00:00
李玉春 03013fe05f Merge branch 'mayue_fixbug_17248,17246' into 'master'
* Fix bug #17248,17246.

See merge request easycorp/zentaopms!838
2021-12-08 08:54:39 +00:00
mayue b1c483be84 * Optimize code #17248,17246. 2021-12-08 16:52:50 +08:00
tianshujie 545652e0e4 * Fix bug #17259. 2021-12-08 16:50:48 +08:00
mayue 80c54b28b5 * Fix bug #17248,17246. 2021-12-08 16:38:45 +08:00
mayue 5761af1ed8 * Fix bug #17248,17246. 2021-12-08 16:31:24 +08:00
李玉春 15ac60bb5c Merge branch 'sprint/xieqiyu_fixbug_17251' into 'master'
* Fix bug#17251.

See merge request easycorp/zentaopms!836
2021-12-08 08:23:55 +00:00
李玉春 2268b70c1d Merge branch 'sprint/xieqiyu_fixbug_17267' into 'master'
* Fix bug#17267.

See merge request easycorp/zentaopms!834
2021-12-08 08:23:21 +00:00
hufangzhou 6da1c0d285 * Fix bug #17263. 2021-12-08 16:20:08 +08:00
xieqiyu b9a474901f * Fix bug#17251. 2021-12-08 16:13:42 +08:00
tianshujie 37a65b6789 * Fix bug #17259. 2021-12-08 16:10:09 +08:00
xieqiyu 38b230a824 * Fix bug#17267. 2021-12-08 16:00:28 +08:00
李玉春 c62ce9a159 Merge branch 'sgm_fixbug' into 'master'
* Fix program kanban error.

See merge request easycorp/zentaopms!829
2021-12-08 07:43:41 +00:00
hufangzhou b1bca8dac0 * Fix bug #17261. 2021-12-08 15:29:13 +08:00
孙广明 114629ec8d Merge branch 'sprint/master_tanghucheng_project' into 'master'
* Fix bug #17126.

See merge request easycorp/zentaopms!797
2021-12-08 07:08:40 +00:00
孙广明 7f7533c521 * Fix program kanban error. 2021-12-08 13:47:24 +08:00
tianshujie f0d7855414 * Fix bug #17243. 2021-12-08 13:36:22 +08:00
李玉春 0c4f0dc504 Merge branch 'sgm_fixbug' into 'master'
* Fix kanban bug.

See merge request easycorp/zentaopms!823
2021-12-08 05:10:01 +00:00
孙广明 c1f2a2272f * Fix kanban bug. 2021-12-08 13:08:28 +08:00
孙广明 74cfe9aa75 * Fix kanban bug. 2021-12-08 11:33:34 +08:00
孙广明 5d02d686cd Merge branch 'sprint/xieqiyu_deleteUnsedCode' into 'master'
* Delete unused code.

See merge request easycorp/zentaopms!822
2021-12-08 03:28:35 +00:00
xieqiyu 6d6d5fa258 * Modify style. 2021-12-08 11:27:47 +08:00
孙广明 2e614c7d2f Merge branch 'sprint/174_tianshujie_17208' into 'master'
* Fix bug #17208.

See merge request easycorp/zentaopms!816
2021-12-08 03:22:22 +00:00
xieqiyu b638ad51c1 * Delete unused code. 2021-12-08 11:15:32 +08:00