Commit Graph
44602 Commits
Author SHA1 Message Date
denghongtao d9e152b444 Add api control. 2022-09-13 07:31:36 +00:00
denghongtao f2888debdc * Delete getswitcher. 2022-09-05 00:59:44 +00:00
denghongtao ac86140b61 - Delete notes. 2022-09-05 00:46:00 +00:00
denghongtao ad21b6149c * Fix unittest. 2022-09-05 00:36:23 +00:00
denghongtao cd4d03806d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into dht_unittest 2022-09-02 05:07:28 +00:00
王怡栋 413c6d64ba Merge branch 'sprint/hufangzhou_26131' into 'master'
* Fix bug #26131.

See merge request easycorp/zentaopms!5244
2022-09-02 05:04:18 +00:00
王怡栋 6376b09468 Merge branch 'sprint/235_dongli_bug27225' into 'master'
* Fix bug #27225.

See merge request easycorp/zentaopms!5249
2022-09-02 05:02:51 +00:00
dongli 2e870f698b * Fix bug #27225. 2022-09-02 04:32:07 +00:00
dongli 36389ce51e * Fix bug #27225. 2022-09-02 04:29:10 +00:00
孙广明 660f9ca5f9 Merge branch 'sprint/235_liumengyi_731' into 'master'
* Fix issue #731.

See merge request easycorp/zentaopms!5248
2022-09-02 03:30:51 +00:00
liumengyi 7b4a22093c * Fix issue #731. 2022-09-02 11:29:49 +08:00
王怡栋 17b58bc39b Merge branch 'sprint/235_liutian_fixissue' into 'master'
* Fix issue #731, #728, #727, #726.

See merge request easycorp/zentaopms!5247
2022-09-02 02:57:35 +00:00
liumengyi 26ba81c2a6 * Optimize code. 2022-09-02 10:56:48 +08:00
wangyidong 908b539e92 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-09-02 10:49:55 +08:00
wangyidong d1cb72d4a2 * code for task #67405. 2022-09-02 10:49:29 +08:00
liumengyi f667c53c82 * Fix issue #731. 2022-09-02 10:46:07 +08:00
管西迎 f3902cda3d Update .gitlab-ci.yml file 2022-09-02 02:00:50 +00:00
hufangzhou c64c9bbf3e * Fix bug #26131. 2022-09-02 09:32:41 +08:00
liumengyi 65e3fc9034 * Fix issue #731. 2022-09-02 09:11:42 +08:00
wangyidong 1d326d5bb9 * code for task #67405. 2022-09-02 09:09:47 +08:00
wangyidong d4cd0de865 * adjust for webhook send weixin message. 2022-09-02 09:09:06 +08:00
tianshujie d3fff0d53f * Fix issue #731. 2022-09-02 09:06:42 +08:00
liumengyi c65e90aef7 * Fix issue. 2022-09-02 08:36:51 +08:00
denghongtao 4a8ab3374c Add unittest. 2022-09-01 09:30:00 +00:00
tianshujie f6117cf17f * Fix issue #731. 2022-09-01 17:19:36 +08:00
sunguangming 812cfb68e2 * Convert task team. 2022-09-01 17:17:10 +08:00
tianshujie 606cfedc10 Merge branch 'sprint/235_liutian_fixissue' of https://gitlab.zcorp.cc/easycorp/zentaopms into liu 2022-09-01 16:17:37 +08:00
tianshujie 708494da4e * Fix issue #731. 2022-09-01 16:17:04 +08:00
王怡栋 121e8fc33d Merge branch 'sprint/235_dongli_bug26188' into 'master'
* Fix bug #26188,#26715.

See merge request easycorp/zentaopms!5241
2022-09-01 07:53:43 +00:00
liumengyi 30998f7add * Finish task #66996. 2022-09-01 15:47:42 +08:00
dongli 51853ef523 * Fix bug #26188. 2022-09-01 07:42:29 +00:00
dongli c808b52681 * Fix bug #26715. 2022-09-01 07:21:09 +00:00
tianshujie c1611935ba * Resolve issue #728. 2022-09-01 15:19:34 +08:00
liumengyi e2d484c49d * Fix issue #726. 2022-09-01 15:12:24 +08:00
dongli a711704373 * Fix bug #26715. 2022-09-01 07:04:16 +00:00
王怡栋 48e11d5186 Merge branch 'sprint/hufangzhou_26458' into 'master'
* Fix bug #26458.

See merge request easycorp/zentaopms!5230
2022-09-01 06:53:53 +00:00
王怡栋 b9ba89d886 Merge branch 'sprint235_17141' into 'master'
* Fix bug#27141,27153

See merge request easycorp/zentaopms!5232
2022-09-01 06:53:32 +00:00
曾刚 d0e33c4e3c * Fix bug#27141,27153 2022-09-01 06:53:32 +00:00
wangyidong 5fe9412a2e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-09-01 14:30:56 +08:00
wangyidong db217f9ffe * fix bug #27056. 2022-09-01 14:30:18 +08:00
王怡栋 e1b02d65f8 Merge branch 'sprint/235_tianshujie_bug' into 'master'
Sprint/235 tianshujie bug

See merge request easycorp/zentaopms!5238
2022-09-01 05:45:30 +00:00
王怡栋 91044145cb Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!5233
2022-09-01 05:42:36 +00:00
孙广明 e00aeb88e6 Merge branch 'sprint/max44_mayue_task#66987' into 'master'
* Finish task #66987.

See merge request easycorp/zentaopms!5239
2022-09-01 05:40:54 +00:00
mayue 66eec9f4db * Finish task #66987. 2022-09-01 13:39:16 +08:00
tianshujie 1bcbf8ce89 * Fix bug #25977. 2022-09-01 13:30:49 +08:00
wangyidong e7d65e1dce Merge branch 'sprint/zentaopms230' 2022-09-01 13:28:26 +08:00
tianshujie f0ab716d29 * Fix bug #25848. 2022-09-01 13:22:52 +08:00
王怡栋 5bb9d5ea6d Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
fix code

See merge request easycorp/zentaopms!5237
2022-09-01 05:21:12 +00:00
lanzongjun 9a3fd86d66 fix code 2022-09-01 13:20:11 +08:00
孙广明 da43a0c083 Merge branch '230' into 'sprint/zentaopms230'
* Fix bug #27110.

See merge request easycorp/zentaopms!5235
2022-09-01 05:17:18 +00:00