Commit Graph
35011 Commits
Author SHA1 Message Date
孙华伟 ffa6d43736 *Fix bug#20452 2022-03-14 16:10:35 +08:00
孙华伟 6d3030063f * 2022-03-14 13:11:08 +08:00
孙华伟 a8fc47a9b9 * 2022-03-14 10:27:03 +08:00
孙广明 9242fefd21 Merge branch 'sprint/pailei2_zhouxudong_50400' into pailei2 2022-03-11 14:31:28 +08:00
孙广明 18efbd44b7 Merge branch 'pailei2' into 'sprint/pailei2_zhouxudong_50400'
# Conflicts:
#   module/product/model.php
2022-03-11 06:31:07 +00:00
zhouxudong 3b6f94502b * Fix bu* Fix bugg 2022-03-11 14:27:15 +08:00
孙广明 3011da9418 Merge branch 'pailei2_xieqiyu_50426' into 'pailei2'
* Fix bug#15946.

See merge request easycorp/zentaopms!2199
2022-03-11 06:26:12 +00:00
孙广明 d3760d2d72 Merge branch 'sprint/pailei2_zhouxudong_50400' into 'pailei2'
* Finish task #50400.

See merge request easycorp/zentaopms!2200
2022-03-11 05:37:17 +00:00
周旭东 e6d630f79b Update model.php 2022-03-11 05:35:31 +00:00
xieqiyu 0cf8facbdf * Fix bug#15946. 2022-03-11 11:16:11 +08:00
zhouxudong 430b666870 * Finish task #50400. 2022-03-11 11:14:18 +08:00
李玉春 abad40f8f6 Merge branch 'pailei2_sunhuawei_50407' into 'pailei2'
Pailei2 sunhuawei 50407

See merge request easycorp/zentaopms!2196
2022-03-11 02:42:52 +00:00
孙华伟 38ddffdd3f * 2022-03-11 10:39:39 +08:00
孙华伟 e4f3113301 *Fix bug#17639 2022-03-11 10:36:44 +08:00
孙广明 d69c8dd9dd Merge branch 'pailei_sj_50431' into 'pailei2'
bug增加必填标识

See merge request easycorp/zentaopms!2193
2022-03-11 01:03:22 +00:00
sunjun f69c9746b5 bug增加必填标识 2022-03-11 08:52:04 +08:00
孙华伟 1dd0399e02 *Fix bug #17639. 2022-03-11 08:33:09 +08:00
李玉春 8b58824005 Merge branch 'pailei2_mayue_bug20539' into 'pailei2'
* Fix bug #20539.

See merge request easycorp/zentaopms!2186
2022-03-10 06:40:52 +00:00
mayue 4092e998c0 * Fix bug #20539. 2022-03-10 14:36:46 +08:00
孙广明 5339844ad2 Merge branch 'pailei2_zhouxin_50414' into 'pailei2'
Pailei2 zhouxin 50414

See merge request easycorp/zentaopms!2182
2022-03-10 05:23:45 +00:00
zhouxin 38ebc88fd5 Fix bug. 2022-03-10 03:20:19 +00:00
zhouxin ccdcec9e32 Fix bug 50414. 2022-03-10 01:49:52 +00:00
李玉春 7d03df0bb0 Merge branch 'sprint/pailei_zhouxudong_50424' into 'pailei2'
* Finish task #50424.

See merge request easycorp/zentaopms!2172
2022-03-10 00:38:19 +00:00
李玉春 8ac10e48fc Merge branch 'pailei2_mayue_bug20545' into 'pailei2'
Fix bug #20545.

See merge request easycorp/zentaopms!2167
2022-03-09 08:51:02 +00:00
mayue 00143907ce Fix bug #20545. 2022-03-09 16:49:03 +08:00
zhouxudong bf07964a60 * Finish task #50424. 2022-03-09 16:46:20 +08:00
孙广明 ff3d5c25c2 Merge branch 'sprint/pailei2_zhouxudong_50425' into 'pailei2'
Sprint/pailei2 zhouxudong 50425

See merge request easycorp/zentaopms!2156
2022-03-09 08:37:52 +00:00
孙广明 4c218d7a69 Merge branch 'pailei_zhangzilong_49888' into 'pailei2'
Pailei zhangzilong 49888

See merge request easycorp/zentaopms!2155
2022-03-09 06:41:53 +00:00
xieqiyu 4ba238cd27 * Modify review code. 2022-03-09 14:36:50 +08:00
孙广明 aa15a88a2c Merge branch 'pailei2_mayue_task50240' into 'pailei2'
* Fix bug #50240.

See merge request easycorp/zentaopms!2160
2022-03-09 06:01:55 +00:00
mayue 9f38f5cd10 * Fix bug #50240. 2022-03-09 13:27:42 +08:00
周旭东 f661baac8a Update importbug.html.php 2022-03-09 05:23:38 +00:00
周旭东 6b9c1cbaae Update kanban.css 2022-03-09 05:22:17 +00:00
zhouxudong 2eb4271b2b * Finishi task #50425. 2022-03-09 13:20:09 +08:00
zhouxudong c8704e30f8 * Finish task #50425. 2022-03-09 11:29:09 +08:00
xieqiyu 58d4a9ad37 * Modify review code. 2022-03-09 11:25:45 +08:00
xieqiyu 139ea1e04a * Modify review code. 2022-03-09 11:17:36 +08:00
zhangzilong 1e58bc537c * Code for task #49888. 2022-03-09 10:51:37 +08:00
zhangzilong 647ee6e54f Merge branch 'pailei_zhangzilong_49888' of https://gitlab.zcorp.cc/easycorp/zentaopms into pailei_zhangzilong_49888 2022-03-09 10:42:40 +08:00
zhangzilong 6327b37eae * Code for task #49888. 2022-03-09 10:41:46 +08:00
xieqiyu a307d49c7f * Modify batch create story action form start ID. 2022-03-09 10:31:24 +08:00
zhangzilong d04161c0cc * Code for task #49888. 2022-03-09 10:08:46 +08:00
zhangzilong 590ba16d6a * Code for task #49888. 2022-03-09 09:32:18 +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
孙华伟 719cd91f8e Update kanban control.php 2022-03-09 01:08:17 +00:00
孙华伟 4ac1b90743 Update model.php 2022-03-09 00:59:31 +00:00
孙华伟 8f3dc47e67 Update kanban control.php 2022-03-09 00:55:06 +00:00
xieqiyu b68d3dda7e * Add selected lane when batch create story in kanban. 2022-03-08 21:14:06 +08:00
李玉春 5d4e08fae7 Merge branch 'sprint/pailei2_zhouxudong_19120' into 'pailei2'
* Fix bug #19120.

See merge request easycorp/zentaopms!2148
2022-03-08 09:20:03 +00:00
zhouxudong 027fbc1472 * Fix bug #19120. 2022-03-08 17:12:52 +08:00