Commit Graph
3282 Commits
Author SHA1 Message Date
liuhong 419e054101 *Fix bug #27982 and Adjust code. 2022-09-28 07:38:07 +00:00
tianshujie 4778db197d * Finish task #70017. 2022-09-28 13:39:06 +08:00
tianshujie 7b2980726e Merge branch 'sprint/244' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244 2022-09-28 11:59:37 +08:00
李玉春 d401ef9626 Merge branch 'sprint/241_tianshujie_70015' into 'sprint/244'
Sprint/241 tianshujie 70015

See merge request easycorp/zentaopms!5577
2022-09-28 03:25:16 +00:00
tianshujie 90946ab3d0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244 2022-09-28 09:23:23 +08:00
胡方舟 a95042508e Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!5564
2022-09-27 05:51:26 +00:00
李玉春 af0256eecb Merge branch 'sprint/cyy_task' into 'sprint/244'
* Modify language.

See merge request easycorp/zentaopms!5554
2022-09-27 05:25:12 +00:00
tianshujie 061d5050f7 * Adjust the record effort style. 2022-09-27 13:24:14 +08:00
王怡栋 272838612f Merge branch 'master_26245' into 'master'
*Fix bug #26245.

See merge request easycorp/zentaopms!5543
2022-09-27 02:24:11 +00:00
liuhong a7980a4852 *Update code logic. 2022-09-27 02:15:22 +00:00
曹延义 f74af95c5e * Adjust code. 2022-09-27 10:04:34 +08:00
曹延义 0911d16112 * Code for task #70495. 2022-09-27 09:59:14 +08:00
liuhong 3501b84719 *Adjust code. 2022-09-27 00:59:14 +00:00
tianshujie 36744c5175 * Adjust the record effort style. 2022-09-27 08:32:17 +08:00
daitingting f7d564e837 * Finish task #70200. 2022-09-26 09:38:11 +00:00
wangyidong 6e6ecb4f6a * finish task #70199. 2022-09-26 17:28:15 +08:00
tianshujie fa4fee7fbb * Fix bug #27949. 2022-09-26 16:54:36 +08:00
tianshujie e479767a69 * Adjust the record effort style. 2022-09-26 15:28:05 +08:00
sunguangming ac8f6c9413 * Code for task effort bug. 2022-09-26 14:50:04 +08:00
liuhong fd0b159b62 *Fix bug #26245. 2022-09-26 06:08:46 +00:00
wangyidong 0ba479e9e5 * finish task #70196. 2022-09-26 13:15:48 +08:00
tianshujie e82f1f6d6a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/241_tianshujie_bug 2022-09-26 08:12:31 +08:00
朱金勇 d3911c77e6 Merge branch 'sprint/241_tianshujie_fixbug' into 'master'
Sprint/241 tianshujie fixbug

See merge request easycorp/zentaopms!5518
2022-09-23 16:05:19 +00:00
tianshujie dfe1c9dc39 * Fix bug #27875. 2022-09-23 15:54:04 +08:00
王怡栋 bb5b178c49 Merge branch 'master_liuhong_27190' into 'master'
*Fix bug #27190.

See merge request easycorp/zentaopms!5516
2022-09-23 05:52:56 +00:00
王怡栋 423dfcd7e9 Merge branch 'cyy_bug' into 'master'
* Modify edit multi task.

See merge request easycorp/zentaopms!5512
2022-09-23 05:50:19 +00:00
tianshujie a20a8b6cdf * Fix bug #27871. 2022-09-23 13:49:57 +08:00
liuhong 047cd27da8 *Fix bug #27190 for adjust code. 2022-09-23 05:43:34 +00:00
liuhong 9f309bdeab *Fix bug #27190. 2022-09-23 05:39:06 +00:00
dingyongliang 09e50c54e8 * task #70014, rm zebra bg. 2022-09-23 05:35:11 +00:00
曹延义 8ce8855258 * Modify edit multi task. 2022-09-23 11:52:00 +08:00
曹延义 5667c2cade * Fix bug #27854. 2022-09-23 11:22:36 +08:00
tianshujie 6f599fad75 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/241_tianshujie_70008 2022-09-23 10:26:29 +08:00
tianshujie 6a7c69e14e * Finish task #70008. 2022-09-23 10:22:32 +08:00
王怡栋 16d1f76ca0 Merge branch 'sprint/cyy_optimize' into 'master'
* Optimize record estimate style.

See merge request easycorp/zentaopms!5499
2022-09-23 02:04:15 +00:00
曹延义 a02d6c751e * Optimize record style. 2022-09-23 09:46:31 +08:00
曹延义 ee0eafe9c6 * Optimize record estimate style. 2022-09-23 09:32:18 +08:00
王怡栋 c77ee31e31 Merge branch 'sprint/hufangzhou_feedback_863' into 'master'
* Handle feedback #863.

See merge request easycorp/zentaopms!5438
2022-09-23 01:23:43 +00:00
tianshujie 3d210a3666 * Finish task #70098. 2022-09-23 09:15:01 +08:00
tianshujie 6fd346708e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/241_tianshujie_task 2022-09-23 08:08:42 +08:00
tianshujie a6cd4e549c * Finish task #70094. 2022-09-22 18:13:50 +08:00
tianshujie 4908ead6e8 * Finish task #70098. 2022-09-22 18:03:03 +08:00
tianshujie 500078a229 * Finish task #70096. 2022-09-22 17:31:40 +08:00
tianshujie 52fb3e71f7 * Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096. 2022-09-22 16:58:27 +08:00
曹延义 e500e05598 * Finish task #70093. 2022-09-22 16:21:56 +08:00
曹延义 b82fe4e667 * Finish task #70099. 2022-09-22 16:00:42 +08:00
曹延义 0ece96c860 * Finish task #70100. 2022-09-22 15:23:18 +08:00
曹延义 1d195ca297 * Finish task #70095. 2022-09-22 15:14:22 +08:00
tianshujie 073c3fc987 * Finish task #70008. 2022-09-22 10:27:55 +08:00
hufangzhou 2b85f8cd1a * Use the php to operate cookie for safe. 2022-09-22 09:41:53 +08:00