Commit Graph
30906 Commits
Author SHA1 Message Date
songchenxuan 33efd7faf3 *Finish task #45539. 2021-12-10 11:34:18 +08:00
songchenxuan 7d58d95af3 *Finish task #45545. 2021-12-10 09:15:55 +08:00
songchenxuan fe8d8166e9 *Finish task #45545. 2021-12-09 11:19:25 +08:00
songchenxuan 2b7e0ed4b3 *Finish task #45545. 2021-12-09 11:16:29 +08:00
songchenxuan 8b874bfbbc *Finish task #45545. 2021-12-09 09:20:45 +08:00
李玉春 fbeed71ba8 Merge branch 'sprint/174_hufangzhou_17276' into 'master'
* Fix bug #17276.

See merge request easycorp/zentaopms!842
2021-12-08 23:55:44 +00: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
李玉春 cb1e0f7e42 Merge branch 'sprint/174_tianshujie_17272' into 'master'
* Fix bug #17272.

See merge request easycorp/zentaopms!840
2021-12-08 09:16:34 +00: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
李玉春 972f3d5753 Merge branch 'sprint/174_hufangzhou_17263' into 'master'
* Fix bug #17263.

See merge request easycorp/zentaopms!837
2021-12-08 08:22:49 +00:00
hufangzhou 6da1c0d285 * Fix bug #17263. 2021-12-08 16:20:08 +08:00
李玉春 687ebe8a5d Merge branch 'sprint/174_tianshujie_17259' into 'master'
* Fix bug #17259.

See merge request easycorp/zentaopms!835
2021-12-08 08:16:44 +00: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
孙广明 a2d79091cc Merge branch 'sprint/174_hufangzhou_17261' into 'master'
* Fix bug #17261.

See merge request easycorp/zentaopms!832
2021-12-08 07:32:20 +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
李玉春 986bd09df8 Merge branch 'sprint/174_tianshujie_17243' into 'master'
* Fix bug #17243.

See merge request easycorp/zentaopms!828
2021-12-08 05:40:07 +00: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
王怡栋 69185d7fb8 Merge branch 'sgm_mergecode' into 'master'
* Merge 169 untrack file to master.

See merge request easycorp/zentaopms!821
2021-12-08 03:12:32 +00:00
tianshujie 2e6414cc8f * Fix bug #17208. 2021-12-08 11:11:12 +08:00
孙广明 13f162edd2 * Merge 169 untrack file to master. 2021-12-08 11:07:06 +08:00
孙广明 87c24eae5a Merge branch 'sprint/174_hufangzhou_action' into 'master'
* Fix the code error.

See merge request easycorp/zentaopms!817
2021-12-08 00:55:02 +00:00
hufangzhou 5c53afeeed * Fix the code error. 2021-12-08 08:47:00 +08:00
孙广明 6300b9d804 Merge branch 'sprint/175_liumengyi_17227' into 'master'
* Fix bug #17227.

See merge request easycorp/zentaopms!815
2021-12-08 00:46:17 +00:00
tianshujie bca286c0aa * Fix bug #17208. 2021-12-08 08:44:41 +08:00
liumengyi 07cd32ed75 * Fix bug #17227. 2021-12-07 18:11:43 +08:00
孙广明 834684ca51 Merge branch 'sprint/174_tianshujie_17173' into 'master'
* Fix bug #17173,17173.

See merge request easycorp/zentaopms!812
2021-12-07 09:24:13 +00:00
tianshujie 4fdb7107dc * Fix bug #17173,17173. 2021-12-07 17:22:14 +08:00