Commit Graph
46356 Commits
Author SHA1 Message Date
tianshujie 3d40cba711 * Fix bug #29278. 2022-11-04 10:20:58 +08:00
tianshujie 787ba2ad2d * Fix bug #29247. 2022-11-04 10:17:00 +08:00
孙广明 30ef18b393 Merge branch 'mayue_feedback#1339' into 'master'
* Fix bug #29238 and finsihed feedback#1339.

See merge request easycorp/zentaopms!6031
2022-11-04 02:00:16 +00:00
mayue 2be0a1f96c * Optimize code. 2022-11-04 09:57:30 +08:00
孙广明 5c4cb5b1e2 Merge branch 'cyy_bug' into 'master'
* Hide pri style when value is null.

See merge request easycorp/zentaopms!6028
2022-11-04 01:53:41 +00:00
caoyanyi e49115a48a * Fix bug #29274. 2022-11-04 09:51:40 +08:00
mayue 4e87bd0ffa * Fix bug #29238 and finsih feedback#1339. 2022-11-04 09:49:33 +08:00
Yagami c0577a8696 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-04 09:22:54 +08:00
Yagami 5aafd5241f * Fix bug #29246. 2022-11-04 09:22:38 +08:00
caoyanyi 829408cc5e * Hide pri style when value is null. 2022-11-04 08:37:35 +08:00
李玉春 f36d8a321d Merge branch 'tianshujie_fixbug' into 'master'
Tianshujie fixbug

See merge request easycorp/zentaopms!6027
2022-11-04 00:35:50 +00:00
孙广明 25ae2bd729 Merge branch 'lyk_feedback_1335' into 'master'
* Resolve feedback 1335.

See merge request easycorp/zentaopms!6026
2022-11-04 00:27:08 +00:00
tianshujie a87a088581 * Fix bug #29207. 2022-11-04 08:26:04 +08:00
liuyongkai f1b7f2e045 * Resolve feedback #1335. 2022-11-04 00:25:13 +00:00
liuyongkai 75e48bc117 * Resolve feedback #1335. 2022-11-04 00:23:33 +00:00
李玉春 d931c3e739 Merge branch 'cyy_bug' into 'master'
* Fix bug #29224, 29094.

See merge request easycorp/zentaopms!6020
2022-11-04 00:10:49 +00:00
Yagami 16fdf991db * Fix bug #29253. 2022-11-03 16:47:52 +08:00
wangyidong 59f0cc09d9 * adjust for account. 2022-11-03 15:58:08 +08:00
孙广明 e20fea93c0 Merge branch 'sprint/fixbug_liumengyi' into 'master'
* Fix bug #29227.

See merge request easycorp/zentaopms!6018
2022-11-03 07:53:39 +00:00
tianshujie 808c99f318 * Fix bug #29230. 2022-11-03 15:43:39 +08:00
caoyanyi abe3332930 * Fix bug #29224, 29094. 2022-11-03 14:56:55 +08:00
孙广明 ad53ea8faf Merge branch 'lyk_feedback_1335' into 'master'
* Resolve feedback 1335

See merge request easycorp/zentaopms!6017
2022-11-03 06:39:00 +00:00
liumengyi 98ceb83f84 * Fix bug #29227. 2022-11-03 14:37:41 +08:00
liuyongkai 503846fa33 * Resolve feedback #1335. 2022-11-03 14:27:55 +08:00
liuyongkai d53024dba9 * Resolve feedback #1335. 2022-11-03 14:26:48 +08:00
王怡栋 5827759d8b Merge branch 'master_feedback_1302' into 'master'
* Fix create task display of execution default no choose.

See merge request easycorp/zentaopms!6009
2022-11-03 05:30:05 +00:00
王怡栋 ba2890aef9 Merge branch 'bug_29171' into 'master'
* Fix bug #29171

See merge request easycorp/zentaopms!6005
2022-11-03 05:28:21 +00:00
李玉春 7d48342cbd Merge branch 'sprint/254_tianshujie_program' into 'master'
Sprint/254 tianshujie program

See merge request easycorp/zentaopms!6010
2022-11-03 02:39:55 +00:00
wangzemei d8d1b19838 * update theme 2022-11-03 10:35:38 +08:00
孙广明 22013a3d4f Merge branch 'sprint/fixbug_liumengyi' into 'master'
* Fix bug of bug link bugs.

See merge request easycorp/zentaopms!6007
2022-11-03 02:28:04 +00:00
tianshujie f946c35e83 * Fix bug #29207. 2022-11-03 10:24:11 +08:00
wangzemei 579eaf12e3 * fix bug 28783 2022-11-03 10:14:10 +08:00
liuhong 8f967da638 * Fix create task display of execution default no choose. 2022-11-03 02:12:06 +00:00
zhujinyong e5aa646144 * Fix session for api. 2022-11-03 10:03:19 +08:00
tianshujie dd98b3e2de * Fix bug #28783. 2022-11-03 09:58:45 +08:00
liumengyi e84e6ac11d * Fix bug of bug link bugs. 2022-11-03 09:51:16 +08:00
tianshujie ff4593f9d2 * Fix bug #28783. 2022-11-03 09:49:47 +08:00
wangzemei f58614ff8a * theme pink red purple 2022-11-03 09:27:41 +08:00
tianshujie 9a4b253718 * Change the color of the program name when hover. 2022-11-03 09:11:33 +08:00
zenggang 26e4e6b282 * Fix bug #29171 2022-11-03 01:01:44 +00:00
孙广明 1a963f09c6 Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #29192.

See merge request easycorp/zentaopms!6000
2022-11-03 00:38:08 +00:00
孙广明 82b5a43150 Merge branch 'sprint/254_tianshujie_kanban' into 'master'
* Refactor.

See merge request easycorp/zentaopms!5998
2022-11-03 00:37:46 +00:00
王怡栋 99de19889b Merge branch 'sprint/hufangzhou_sql' into 'master'
* Add the sql in confirm page.

See merge request easycorp/zentaopms!5999
2022-11-03 00:37:46 +00:00
朱金勇 5ef17447fd Merge branch 'sprint/format-api' into 'master'
* Remove use exit for api.

See merge request easycorp/zentaopms!5962
2022-11-03 00:32:42 +00:00
鲁飞 e0cd779954 * Remove use exit for api. 2022-11-03 00:32:42 +00:00
liyuchun b60ba43c37 * Fix bug #29192. 2022-11-02 16:51:46 +08:00
hufangzhou d095daee76 * Add the sql in confirm page. 2022-11-02 08:33:05 +00:00
tianshujie af0be6c87a * Merge. 2022-11-02 16:28:26 +08:00
王怡栋 5e7e6161fb Merge branch 'sprint/hufangzhou_bug' into 'master'
* Fix an error.

See merge request easycorp/zentaopms!5997
2022-11-02 08:08:14 +00:00
hufangzhou b08746ca3c * Fix an error. 2022-11-02 08:06:59 +00:00