Commit Graph

553 Commits

Author SHA1 Message Date
王怡栋
fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
zhouxin
f280e32777 Fix bug #17415. 2022-03-18 02:43:14 +00:00
zhouxudong
c011895995 * Fix bug #20121. 2022-03-17 16:34:32 +08:00
李玉春
59ff30de9d Merge branch 'pailei2_sunhuawei_50407' into 'pailei2'
Pailei2 sunhuawei 50407

See merge request easycorp/zentaopms!2265
2022-03-15 05:43:03 +00:00
孙华伟
dd727476ad * Fix bug #17639. 2022-03-15 13:36:52 +08:00
sunjun
7411c4c4f3 fix bug #50431 2022-03-11 15:59:07 +08:00
Zongjun Lan
b51e39e69f * fix bug #20640 2022-03-11 14:58:39 +08:00
sunjun
f69c9746b5 bug增加必填标识 2022-03-11 08:52:04 +08:00
孙广明
382c57984e Merge branch 'pailei_sunhuawei_story31107' into 'pailei2'
Pailei sunhuawei story31107

See merge request easycorp/zentaopms!2151
2022-03-09 01:14:21 +00:00
李玉春
3b79f9ce1c Merge branch 'sprint/pailei2_zhouxudong_fixbug' into 'pailei2'
* Fix bug #19962.

See merge request easycorp/zentaopms!2137
2022-03-08 06:40:16 +00:00
tianshujie
54ac0f8c8e * Finish task #50380. 2022-03-08 13:52:34 +08:00
zhouxudong
cbe21a49d8 * Fix bug #19962. 2022-03-08 10:56:25 +08:00
孙广明
23ebec3d25 Merge branch 'sprint/187_liumengyi_50324' into 'master'
* Finish task #50324.

See merge request easycorp/zentaopms!2109
2022-03-07 05:19:08 +00:00
孙广明
1b137f7bc8 Merge branch 'sprint/187_tianshujie' into 'master'
Sprint/187 tianshujie

See merge request easycorp/zentaopms!2107
2022-03-07 05:13:55 +00:00
liumengyi
15a95e6c6b * Finish task #50324. 2022-03-07 11:05:46 +08:00
孙广明
7b962c4e38 Merge branch 'pailei' 2022-03-07 10:56:26 +08:00
tianshujie
afed9c5c71 * Finish task #50338. 2022-03-07 10:37:41 +08:00
孙华伟
d8bb8a903e * 2022-03-04 14:34:01 +08:00
liumengyi
86d19f82f7 * Fix bug #20290. 2022-03-03 14:53:58 +08:00
孙华伟
c01323fdbb *Fix bug #20273 . 2022-03-03 09:40:43 +08:00
孙华伟
e0640737c2 *Fix bug #20273. 2022-03-03 09:34:41 +08:00
李玉春
a0da36e3f2 Merge branch 'pailei' into 'pailei_sunhuawei_story_30528'
# Conflicts:
#   module/execution/control.php
#   module/execution/view/kanban.html.php
2022-03-02 05:34:15 +00:00
孙华伟
e7d721af85 * 2022-03-02 13:15:04 +08:00
孙华伟
03b0221c99 * 2022-03-02 13:08:22 +08:00
孙华伟
fa34d9e024 * 2022-03-02 11:31:50 +08:00
孙华伟
51b7e615e0 * 2022-03-02 11:30:20 +08:00
孙华伟
5d61f31c3b * 2022-03-02 11:22:23 +08:00
孙华伟
abd00b8f08 * 2022-03-02 11:13:22 +08:00
孙华伟
33a2aec741 * 2022-03-02 11:00:51 +08:00
孙广明
b63fa55607 Merge branch 'pailei_zhangzilong_49297' into 'pailei'
* Finish task #49297.

See merge request easycorp/zentaopms!2029
2022-03-02 03:00:45 +00:00
孙华伟
0402049b85 * 2022-03-02 10:58:08 +08:00
zhangzilong
92f4d32a68 * Finish task #49297. 2022-03-02 10:57:48 +08:00
孙华伟
f4bed0d0c6 * 2022-03-02 10:28:01 +08:00
孙华伟
a282e6c0e6 *Story #30528. 2022-03-02 09:56:58 +08:00
孙广明
5decf2cf6c Merge branch 'sprint/185_zhouxudong_19962' into 'pailei'
* Finish task #49696.

See merge request easycorp/zentaopms!1991
2022-03-02 00:31:17 +00:00
xieqiyu
06af0ff6c4 * Code for task#49696. 2022-03-01 17:28:57 +08:00
孙华伟
23511a0472 *Story #30528. 2022-03-01 15:37:05 +08:00
zhangzilong
d8178d01eb * Finish task #49297. 2022-03-01 14:27:16 +08:00
孙华伟
af06215820 * 2022-03-01 14:20:06 +08:00
孙华伟
b116054287 * 2022-03-01 14:07:45 +08:00
孙华伟
8b79ae9c09 *Story #30528 2022-03-01 14:00:40 +08:00
zhangzilong
9150e9903b * Finish task #49297. 2022-03-01 11:00:08 +08:00
孙华伟
87db779922 * 2022-03-01 10:27:19 +08:00
tianshujie
b1afcd3a6e * Fix bug #20154. 2022-03-01 10:15:29 +08:00
zhangzilong
868a293324 * 2022-03-01 10:05:30 +08:00
孙华伟
40405cf7ec * 2022-03-01 08:42:43 +08:00
孙广明
12721702c2 Merge branch 'pailei_zhangzilong_49297' into 'pailei'
* Finish task #49297.

See merge request easycorp/zentaopms!2009
2022-02-28 09:22:33 +00:00
zhengrunyu
62699ca48d * Finish task 49294 . 2022-02-28 15:51:59 +08:00
孙华伟
271e52a98c * 2022-02-28 15:46:06 +08:00
zhangzilong
b4176af440 * Finish task #49297. 2022-02-28 15:31:43 +08:00