Commit Graph

484 Commits

Author SHA1 Message Date
zenggang
2b50a60ddc * Adjust code style 2021-12-03 09:36:33 +00:00
zenggang
303ecdf5c8 * Adjust code stye 2021-12-03 07:40:08 +00:00
zenggang
7248447ed7 * Fix bug#16786,16981 2021-12-03 06:59:44 +00:00
李玉春
0f2ea93509 Merge branch 'devops_16884' into 'master'
* Fix bug#16884,16856

See merge request easycorp/zentaopms!758
2021-12-03 05:22:07 +00:00
zenggang
4b53f349df * Fix bug#16736,17037,16844 2021-12-03 01:59:04 +00:00
孙广明
32ec141d3d Merge branch 'sprint/devops_liyuchun_bug' into 'master'
* Adjust style.

See merge request easycorp/zentaopms!750
2021-12-03 01:04:19 +00:00
zenggang
42a5e9bf78 * Fix bug#16884,16856 2021-12-02 09:32:45 +00:00
liyuchun
8e11431865 * Adjust style. 2021-12-02 15:46:53 +08:00
李玉春
3955798100 Merge branch 'devops_17024' into 'master'
* Fix bug#17027,17024,16884

See merge request easycorp/zentaopms!741
2021-12-02 07:35:33 +00:00
孙广明
3aa9a7d37f Merge branch 'sprint/devops_liyuchun_bug' into 'master'
Sprint/devops liyuchun bug

See merge request easycorp/zentaopms!742
2021-12-02 07:34:42 +00:00
liyuchun
da73e10709 * Fix bug #16856. 2021-12-02 15:32:27 +08:00
zenggang
0cf9288308 * Fix bug#17027,17024,16884 2021-12-02 06:26:33 +00:00
liyuchun
2899947808 * Fix bug #16725. 2021-12-02 14:18:13 +08:00
孙广明
1c86d07967 Merge branch 'sprint/devops_liyuchun_bug' into 'master'
Sprint/devops liyuchun bug

See merge request easycorp/zentaopms!738
2021-12-02 06:16:37 +00:00
liyuchun
696892f246 * Fix bug #16716. 2021-12-02 14:14:29 +08:00
liyuchun
b75c77b3e7 * Fix bug #17000. 2021-12-02 14:07:06 +08:00
孙广明
54c761da36 Merge branch 'sprint/devops_liyuchun_16893' into 'master'
* Fix gitlab error.

See merge request easycorp/zentaopms!731
2021-12-02 05:55:15 +00:00
liyuchun
6caf5097ec * Fix error of gitlab. 2021-12-02 13:54:06 +08:00
liyuchun
0e30ba0a3b * Fix bug #16836. 2021-12-02 13:19:50 +08:00
李玉春
ee0bdfb1a2 Merge branch 'devops_16736' into 'master'
* Fix bug#16846

See merge request easycorp/zentaopms!732
2021-12-02 05:05:04 +00:00
zenggang
0803759223 * Fix bug#16846 2021-12-02 03:06:27 +00:00
liyuchun
61045c90e6 * Fix gitlab error. 2021-12-02 11:04:54 +08:00
liyuchun
e0b03a60a7 * Fix bug #16999. 2021-12-02 09:54:03 +08:00
liyuchun
f6301e4c9a Merge branch 'sugon' 2021-12-01 16:48:00 +08:00
liyuchun
d11f6e9b6f * Fix bug #16901. 2021-12-01 16:29:36 +08:00
liyuchun
1eb3e7ec98 * Fix bug #16903. 2021-12-01 15:50:30 +08:00
liyuchun
aa118473b2 * Fix bug #16893. 2021-12-01 14:14:06 +08:00
liyuchun
bdccb46405 * Fix bug #16918. 2021-12-01 13:57:33 +08:00
liyuchun
9deab6a19a Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon 2021-12-01 13:47:11 +08:00
liyuchun
b91bd45f85 * Fix bug #16903. 2021-12-01 13:46:48 +08:00
zenggang
deb6809979 * Fix bug#16916 2021-12-01 05:40:22 +00:00
liyuchun
0a29344b53 * Fix bug #16898. 2021-12-01 10:54:13 +08:00
zenggang
ce93ea9cf0 * Fix bug#16741 2021-12-01 01:05:20 +00:00
liyuchun
4a6faf94ee Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon 2021-11-30 16:11:27 +08:00
liyuchun
053f78ba97 * Fix bug #16893. 2021-11-30 16:11:08 +08:00
zenggang
d60dfdb494 * Fix bug#16810 2021-11-30 07:43:02 +00:00
zenggang
5088748be4 * Fix bug#16861 2021-11-30 07:04:46 +00:00
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
王怡栋
b3cb90e69e * replace processMarkdown method. 2021-11-30 09:58:11 +08:00
liyuchun
6200b6dc58 * Fix bug #16719. 2021-11-29 16:57:21 +08:00
zenggang
9fee3403fe * Fix bug#16890,16888 2021-11-29 07:08:48 +00:00
liyuchun
1e5db8c6db * Finish task #44798. 2021-11-29 13:30:33 +08:00
liyuchun
ad5dfa073c * Fix bug #16845. 2021-11-29 08:39:32 +08:00
liyuchun
5b76958a3b * Fix bug #16719. 2021-11-26 15:57:31 +08:00
zenggang
6f43788b0c * Fix bug#16722 2021-11-26 05:16:35 +00:00
zenggang
7a53ada4b3 * Fix bug#16734 2021-11-26 03:00:16 +00:00
liyuchun
0479696334 * Finish task #44798. 2021-11-25 17:23:46 +08:00
zenggang
1520eeb375 * Adjust code 2021-11-25 08:08:12 +00:00
liyuchun
facb6f1ce4 * Fix bug #16715. 2021-11-25 15:59:54 +08:00
zenggang
59605b34a6 * Finish task#44806 2021-11-25 07:52:32 +00:00