Commit Graph
28527 Commits
Author SHA1 Message Date
dingguodong 0a93db90f2 * Add comments and notes. 2021-10-27 10:41:03 +08:00
dingguodong e7c337c8b5 * Fix the bug that compile can run scheduled job. 2021-10-27 10:39:54 +08:00
dingguodong fff67388f8 * Fix the bug that user can not select pipeline from jenkins. 2021-10-27 10:39:11 +08:00
孙广明 1275fa87cd Merge branch 'sprint/169_tanghucheng_43557' into 'sprint/169'
Finish task #43557

See merge request easycorp/zentaopms!170
2021-10-27 02:29:46 +00:00
孙广明 1007936087 Merge branch 'sprint/169_wangjingbo_43541' into 'sprint/169'
Sprint/169 wangjingbo 43541

See merge request easycorp/zentaopms!157
2021-10-27 02:29:25 +00:00
孙广明 5cec976a63 Merge branch 'sprint/169_zhouxin_43561' into 'sprint/169'
Sprint/169 zhouxin 43561

See merge request easycorp/zentaopms!160
2021-10-27 02:28:04 +00:00
tanghucheng 554214895b * Finish task #43557 2021-10-27 10:26:23 +08:00
tanghucheng a6544b38ed * Finish task #43557. 2021-10-27 10:05:51 +08:00
李玉春 e565ab289a Merge branch 'sprint/169_mayue_15712' into 'sprint/169'
*Fix a bug #15712

See merge request easycorp/zentaopms!164
2021-10-27 00:57:38 +00:00
mayue 131b428d20 *Fix a bug #15712 2021-10-26 18:20:14 +08:00
zhouxin 396d267729 Finish task #43561. 2021-10-26 16:00:50 +08:00
wangjingbo 706128a141 * Finish task #43541. 2021-10-26 15:39:25 +08:00
王怡栋 014bf4f068 Merge branch 'sprint/169_liugang_bug' into 'sprint/169'
Remove the outdated code and fix return value.

See merge request easycorp/zentaopms!152
2021-10-26 07:31:50 +00:00
孙广明 dd2657b9a1 Merge branch 'spring/169/xiawenlong' into 'sprint/169'
Spring/169/xiawenlong

See merge request easycorp/zentaopms!156
2021-10-26 07:31:25 +00:00
xiawenlong d4f7c938c1 rollback code. 2021-10-26 15:26:05 +08:00
李玉春 c7f185503c Merge branch 'sprint/169_mayue_15739' into 'sprint/169'
*Fix a bug #15739

See merge request easycorp/zentaopms!150
2021-10-26 07:12:32 +00:00
孙广明 354061c768 Merge branch 'sprint/169_tanghucheng_43549' into 'sprint/169'
Finish task #43549

See merge request easycorp/zentaopms!151
2021-10-26 07:10:17 +00:00
mayue fdc33354fc *Fix a bug #15739 2021-10-26 15:01:14 +08:00
liugang c884f07868 * Remove the outdated code. 2021-10-26 14:56:48 +08:00
liugang dd729bb202 * Fix return value. 2021-10-26 14:55:15 +08:00
mayue 4e082eb883 *Fix a bug #15739 2021-10-26 14:48:54 +08:00
tanghucheng aa9aeb37b0 * Finish task #43549. 2021-10-26 14:48:32 +08:00
mayue 17118b4595 *Fix a bug #15739 2021-10-26 14:37:42 +08:00
xiawenlong 9edd374612 * Finish task #43551. 2021-10-26 14:06:45 +08:00
zhouxin b28abf1c4c Finish task#43538. 2021-10-26 13:02:12 +08:00
tanghucheng a577f54958 * Finish task #43557. 2021-10-26 10:45:49 +08:00
xiawenlong 58116c1bbc * Finish task #43543. 2021-10-26 10:06:38 +08:00
孙广明 aad6d4c76a Merge branch 'spirnt/167_liyuchun_15164' into 'sprint/167'
* Fix bug #15164.

See merge request easycorp/zentaopms!138
2021-10-22 03:14:47 +00:00
liyuchun 28a87df599 * Fix bug #15164. 2021-10-22 11:11:10 +08:00
王怡栋 839371a9d4 Merge branch 'sprint/167_sgm_api' into 'sprint/167'
* Add cases of user.

See merge request easycorp/zentaopms!97
2021-10-22 01:28:18 +00:00
王怡栋 39a6596687 Merge branch 'sprint/167_hufangzhou_15717' into 'sprint/167'
* Fix bug #15717.

See merge request easycorp/zentaopms!133
2021-10-22 01:23:33 +00:00
hufangzhou bf6b658810 * Fix bug #15717. 2021-10-22 08:45:02 +08:00
李玉春 a24fbb9075 Merge branch 'sprint/167_tianshujie_15698' into 'sprint/167'
* Fix bug #15698.

See merge request easycorp/zentaopms!129
2021-10-21 00:37:05 +00:00
tianshujie 69743fa3a4 * Fix bug #15698. 2021-10-21 08:32:55 +08:00
孙广明 78eb0b7ebc Merge branch 'sprint/167_liyuchun_15684' into 'sprint/167'
* Fix bug #15684.

See merge request easycorp/zentaopms!128
2021-10-20 09:11:48 +00:00
liyuchun d92c073cb5 * Fix bug #15684. 2021-10-20 17:08:53 +08:00
孙广明 c16a7cc2f1 Merge branch 'sprint/167_liyuchun_15684' into 'sprint/167'
* Fix bug #15684.

See merge request easycorp/zentaopms!127
2021-10-20 08:56:36 +00:00
liyuchun 5eb305f393 * Fix bug #15684. 2021-10-20 16:40:47 +08:00
孙广明 7cd46da726 Merge branch 'sprint/167_liyuchun_15592' into 'sprint/167'
* Fix bug #15592.

See merge request easycorp/zentaopms!125
2021-10-20 08:07:38 +00:00
liyuchun fce0f3aafa * Fix bug #15592. 2021-10-20 16:04:44 +08:00
孙广明 a3948383f8 Merge branch 'sprint/167_api_doc' into 'sprint/167'
* Fix bug #15674.

See merge request easycorp/zentaopms!124
zentaopms_15.7_20211020
2021-10-20 07:40:43 +00:00
李玉春 28698c9061 Merge branch 'sprint/167_tianshujie_15679' into 'sprint/167'
* Fix bug #15679.

See merge request easycorp/zentaopms!123
2021-10-20 07:34:30 +00:00
tianshujie eaaed9cfe6 * Fix bug #15679. 2021-10-20 15:32:02 +08:00
liyuchun 3f279a9ec1 * Fix bug #15674. 2021-10-20 15:00:11 +08:00
朱金勇 53cccbed9f Merge branch 'sprint/167_api_doc' into 'sprint/167'
fix many subfiled bug

See merge request easycorp/zentaopms!122
2021-10-20 05:59:34 +00:00
hufangzhou e912a03df7 * Fix bug #15673. 2021-10-20 13:50:51 +08:00
xiawenlong 902d24ff14 fix code style 2021-10-20 13:48:18 +08:00
xiawenlong e5cac550f5 fix many subfield bug. 2021-10-20 13:39:58 +08:00
zhujinyong 04d67237b7 * Cannot change account. 2021-10-20 11:26:43 +08:00
zhujinyong 9ca19c49d1 Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 2021-10-20 11:23:20 +08:00