Commit Graph

3259 Commits

Author SHA1 Message Date
mayue
e45a22f25d * Fix bug #29410. 2022-11-14 14:47:50 +08:00
mayue
03ff3c3b36 * Optimize page style. 2022-11-14 10:55:28 +08:00
mayue
c92e9f119a * Finish task #75649. 2022-11-11 17:02:17 +08:00
wangyuting
152364d338 * Finish task #29562. 2022-11-11 02:12:03 +00:00
王怡栋
3beb994fe8 Merge branch 'master_bug_29451' into 'master'
* Fix bug #29451

See merge request easycorp/zentaopms!6095
2022-11-10 06:24:33 +00:00
zenggang
fd5682fbdc * Fix bug #29460 2022-11-09 07:48:08 +00:00
liuhong
f12632a8fb * Fix bug #29451 2022-11-09 02:15:23 +00:00
wangyidong
8ee88df5de Merge branch 'zentaopms_252' 2022-11-08 09:23:23 +08:00
wangyidong
9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
tianshujie
32c5c0550b * Adjust the page of the multiplayer task. 2022-11-07 13:30:17 +08:00
tianshujie
8e67ec5de9 * Optimize the form for recording work hours for multi-person tasks. 2022-11-07 11:04:45 +08:00
tianshujie
280a37559e * Fix bug #29293. 2022-11-07 10:03:47 +08:00
tianshujie
91f6d1b9f0 * Fix bug #29293. 2022-11-07 09:54:41 +08:00
tianshujie
5ea7567745 * Fix bug #27975. 2022-11-07 09:39:52 +08:00
tianshujie
2176378af6 * Fix bug #29339. 2022-11-07 09:11:40 +08:00
liumengyi
0159cabcff * Fix bug #29272. 2022-11-07 09:05:56 +08:00
tianshujie
26efc38fbb * Fix bug #29293. 2022-11-04 15:54:29 +08:00
liuhong
1b7c9a9897 * Fix bug #29290. 2022-11-04 07:32:00 +00:00
mayue
2be0a1f96c * Optimize code. 2022-11-04 09:57:30 +08:00
mayue
4e87bd0ffa * Fix bug #29238 and finsih feedback#1339. 2022-11-04 09:49:33 +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
Yagami
16fdf991db * Fix bug #29253. 2022-11-03 16:47:52 +08:00
tianshujie
808c99f318 * Fix bug #29230. 2022-11-03 15:43:39 +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
liuhong
8f967da638 * Fix create task display of execution default no choose. 2022-11-03 02:12:06 +00:00
tianshujie
dd98b3e2de * Fix bug #28783. 2022-11-03 09:58:45 +08:00
tianshujie
ff4593f9d2 * Fix bug #28783. 2022-11-03 09:49:47 +08:00
liuhong
ad6ee6377b * Resolved feedback #1302. 2022-11-02 05:51:09 +00:00
李玉春
314f82091d Merge branch 'cyy_project' into 'master'
* Modify project icon.

See merge request easycorp/zentaopms!5960
2022-11-01 07:09:55 +00:00
caoyanyi
13f53cc5bc * Fix bug #28998. 2022-11-01 14:28:03 +08:00
王怡栋
707df59e48 Merge branch 'master_bug_26228' into 'master'
* Adjust code for bug #26228.

See merge request easycorp/zentaopms!5961
2022-11-01 05:33:20 +00:00
王怡栋
afd87a2364 Merge branch 'sprint/hufangzhou_feedback_1304' into 'master'
* Handle feedback #1304.

See merge request easycorp/zentaopms!5957
2022-11-01 05:32:32 +00:00
liuhong
fe056715f5 * Adjust code for bug #26228. 2022-10-31 10:03:23 +00:00
Lufei
031838a6ce * Fix loadModel for entry. 2022-10-31 16:36:52 +08:00
hufangzhou
402d4a6333 * Handle feedback #1304. 2022-10-31 07:31:00 +00:00
liuhong
0e81c1cf78 * Fix bug #26228. 2022-10-30 04:39:47 +00:00
tianshujie
5fdc7eff1a Modify the maintenance task team action button style. 2022-10-28 16:05:22 +08:00
caoyanyi
7716ba592e * Adjust code. 2022-10-28 10:39:24 +08:00
caoyanyi
284cade04a * Fix bug #28170. 2022-10-28 10:10:41 +08:00
tanghucheng
376ce75e79 * Fix bug #29031,#29042,#29039. 2022-10-27 15:41:59 +08:00
wangyidong
148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
tianshujie
354e8c129b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247 2022-10-26 08:42:00 +08:00
zenggang
1e22332937 * Fix bug#28886 2022-10-25 01:02:04 +00:00
wangyidong
ef7072c10a * fix bug #28870. 2022-10-24 14:11:29 +08:00
李玉春
90f948780e Merge branch 'cyy_bug' into 'master'
* Fix bug #28786.

See merge request easycorp/zentaopms!5851
2022-10-21 08:30:02 +00:00
王怡栋
d1960a0f55 Merge branch 'master_bug_24436' into 'master'
* Fix bug #24436.

See merge request easycorp/zentaopms!5853
2022-10-21 07:57:15 +00:00
caoyanyi
380777ecf8 * Fix bug #28788. 2022-10-21 13:19:54 +08:00
liuhong
482196b246 * Fix bug #24436. 2022-10-21 04:28:26 +00:00
caoyanyi
4b481f534b * Fix bug #28786. 2022-10-21 11:25:54 +08:00
tianshujie
ae0c045c02 * Optimize the style of maintaining multi-tasking teams. 2022-10-20 16:06:26 +08:00