Commit Graph
28633 Commits
Author SHA1 Message Date
mayue f123cdefc1 * Fix bug #12047. 2021-11-04 08:18:20 +08:00
李玉春 c3a2ed73ba Merge branch 'sprint/170_zhouxin_43875' into 'sprint/170'
Finish task #43875.

See merge request easycorp/zentaopms!290
2021-11-03 07:38:21 +00:00
zhouxin b5d3e49e80 Finish task #43875. 2021-11-03 15:22:31 +08:00
李玉春 01e30c4dbd Merge branch 'sprint/170_mayue_15780' into 'sprint/170'
* Fix bug #15780.

See merge request easycorp/zentaopms!288
2021-11-03 07:18:17 +00:00
李玉春 961a683fcb Merge branch 'sprint/170_songchenxuan_15691' into 'sprint/170'
* Fix bug #15691.

See merge request easycorp/zentaopms!289
2021-11-03 07:17:40 +00:00
root 30c118cd9a * Fix bug #15691 2021-11-03 15:06:36 +08:00
mayue c916df0117 * Fix bug #15780. 2021-11-03 15:05:44 +08:00
mayue be67b785b3 * Fix bug #15780. 2021-11-03 14:50:48 +08:00
root 8fb62009f4 * Fix bug #15691. 2021-11-03 14:45:14 +08:00
hufangzhou 8b1b92bdfc * Add the version. zentaopms_15.7.1_20211102 2021-11-02 12:37:51 +08:00
王怡栋 f8e3ffe97b Merge branch 'sprint/169' 2021-11-02 09:54:05 +08:00
李玉春 07581624f2 Merge branch 'sprint/169_hufangzhou_bug' into 'sprint/169'
* Fix bug #15838.

See merge request easycorp/zentaopms!271
2021-11-02 01:00:26 +00:00
hufangzhou 70c21e6a28 * Fix bug #15838. 2021-11-02 08:56:20 +08:00
李玉春 67743d72d9 Merge branch 'sprint/169_songchenxuan_15784' into 'sprint/169'
Sprint/169 songchenxuan 15784

See merge request easycorp/zentaopms!267
2021-11-01 09:22:43 +00:00
root 1c4ceda168 Fix bug 15784 2021-11-01 17:19:25 +08:00
root 1aac9130a4 Fix bug 15784 2021-11-01 17:16:28 +08:00
root 69287cea22 Fix bug 15784 2021-11-01 17:06:51 +08:00
root 8101f661ab Fix bug 15784 2021-11-01 17:01:13 +08:00
root 01656fd005 Fix bug 15784 2021-11-01 16:59:27 +08:00
李玉春 771de2c02e Merge branch 'sprint/169_xieqiyu_15716' into 'sprint/169'
* Fix bug#15716.

See merge request easycorp/zentaopms!265
2021-11-01 08:42:37 +00:00
xieqiyu 00d83c729c * Fix bug#15716. 2021-11-01 16:40:18 +08:00
root 7f9028691c Fix bug 15784 2021-11-01 16:20:56 +08:00
王怡栋 46f2aecae3 Merge branch 'sprint/167' 2021-11-01 15:27:58 +08:00
孙广明 d77254c662 Merge branch 'sprint/169_zhengrunyu_43708' into 'sprint/169'
*Finish task #43708.

See merge request easycorp/zentaopms!255
2021-11-01 07:26:28 +00:00
王怡栋 a2ca4f646f Merge branch '15.6' 2021-11-01 15:23:15 +08:00
zhengrunyu 4f5c9691a3 *Finish task #43708. 2021-11-01 14:12:39 +08:00
zhengrunyu d7418db734 *Finish task #43708. 2021-11-01 14:07:11 +08:00
李玉春 d4fdd7b9e2 Merge branch 'sprint/169_tianshujie_43621' into 'sprint/169'
* Finish task #43621.

See merge request easycorp/zentaopms!249
2021-11-01 02:45:38 +00:00
孙广明 da02aa3742 Merge branch 'sprint/169_zhengrunyu_43708' into 'sprint/169'
* Finish task #43708.

See merge request easycorp/zentaopms!248
2021-11-01 02:40:36 +00:00
zhengrunyu 594eae2a3f * Finish task #43708. 2021-11-01 10:33:20 +08:00
zhengrunyu bd765c6881 * Finish task #43708. 2021-11-01 10:27:34 +08:00
孙广明 39cdb1dc32 Merge branch 'sprint/169_zhouxin_43556' into 'sprint/169'
Finish task #43556.

See merge request easycorp/zentaopms!232
2021-11-01 02:27:17 +00:00
tianshujie 96513f604e * Modify and maintain product line logic. 2021-11-01 10:21:11 +08:00
tianshujie f78f9ecdfe * Finish task #43621. 2021-11-01 10:18:21 +08:00
孙广明 d17f0f28ce Merge branch 'sprint/169_tanghucheng_43707' into 'sprint/169'
* Finish task #43707.

See merge request easycorp/zentaopms!236
2021-11-01 02:18:14 +00:00
孙广明 cdb03367bb Merge branch 'sprint/169_zhouxin_43539' into 'sprint/169'
Finish task #43539.

See merge request easycorp/zentaopms!238
2021-11-01 02:16:29 +00:00
朱金勇 976f3b80ad Merge branch 'sprint/169' into 'sprint/169'
* Adjust and correct codes for gitlab module.

See merge request easycorp/zentaopms!222
2021-11-01 02:11:15 +00:00
zhengrunyu da27ff9c06 * Finish task #43708 2021-11-01 10:08:36 +08:00
zhengrunyu 0ae939a806 1 2021-11-01 09:52:09 +08:00
李玉春 e4a3dc1b88 Merge branch 'sprint/169_songchenxuan_15467' into 'sprint/169'
Sprint/169 songchenxuan 15467

See merge request easycorp/zentaopms!244
2021-11-01 01:50:03 +00:00
root 0a6a4d2e1d sovle bug 15467 2021-11-01 09:39:07 +08:00
root 6db04fa88e bug_15467 2021-11-01 09:29:45 +08:00
李玉春 cfa69a4143 Merge branch 'sprint/169_xiawenlong' into 'sprint/169'
finish 43676

See merge request easycorp/zentaopms!243
2021-11-01 01:00:56 +00:00
xiawenlong 0e03f7c478 finish 43676 2021-11-01 08:54:01 +08:00
dingguodong 07bcb9012e Merge branch 'sprint/169' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/169 2021-10-29 17:33:56 +08:00
dingguodong ff55234a7b * Correct codes in job and compile module. 2021-10-29 17:33:13 +08:00
孙广明 6877e4c7f0 Merge branch 'sprint/169_mayue_15835' into 'sprint/169'
* Fix a bug #15835.

See merge request easycorp/zentaopms!242
2021-10-29 09:30:36 +00:00
孙广明 0a8de60c4e Merge branch 'sprint/169_zhouxin_43617' into 'sprint/169'
Finish task #43617.

See merge request easycorp/zentaopms!229
2021-10-29 07:17:58 +00:00
mayue 217927ce09 * Fix a bug #15835. 2021-10-29 14:47:21 +08:00
zhouxin ad40f5be8e Finish task #43539. 2021-10-29 14:42:16 +08:00