Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
34,680 Commits 2 Branches 292 Tags
d8bb8a903e2446f7ff4ad0c81cedfc923a4e8bb2
Commit Graph
1354 Commits
Author SHA1 Message Date
孙华伟 d8bb8a903e * 2022-03-04 14:34:01 +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
孙华伟 8623e8553e :Merge branch 'pailei_sunhuawei_story_30528' of https://gitlab.zcorp.cc/easycorp/zentaopms into pailei_sunhuawei_story_30528 2022-03-02 13:16:58 +08:00
孙华伟 e7d721af85 * 2022-03-02 13:15:04 +08:00
李玉春 aeaf877933 Update kanban.js 2022-03-02 05:11:04 +00: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
xieqiyu e3b101a807 * Fix bug of foreach. 2022-03-02 09:36:54 +08:00
zhangzilong 2f38d907ee * Code for task #49297. 2022-03-02 09:07:15 +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 daefe27bf5 * Delete unused code. 2022-03-01 17:33:45 +08: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
孙广明 6873b1061f Merge branch 'sprint/185_xieqiyu_49304' into 'pailei' 
Sprint/185 xieqiyu 49304

See merge request easycorp/zentaopms!2007
 2022-03-01 07:04:26 +00:00
孙华伟 5b99190d32 * 2022-03-01 14:53:57 +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 aff8bf40ef * Finish task #49297. 2022-03-01 11:19:01 +08:00
zhangzilong 9150e9903b * Finish task #49297. 2022-03-01 11:00:08 +08:00
zhangzilong 1777586537 * Finish task #49297. 2022-03-01 10:59:25 +08:00
孙华伟 87db779922 * 2022-03-01 10:27:19 +08:00
zhangzilong 83bf7d564a * Finish task #49297. 2022-03-01 10:13:43 +08:00
zhangzilong 868a293324 * 2022-03-01 10:05:30 +08:00
孙华伟 40405cf7ec * 2022-03-01 08:42:43 +08:00
xieqiyu af76bc5b46 * Append story module when change product type. 2022-02-28 17:50:06 +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
孙华伟 0ea4f15d4b * 2022-02-28 14:36:44 +08:00
zhangzilong e30a8b1343 * Finish task #49297. 2022-02-28 14:27:55 +08:00
xieqiyu 5f6c2bec3b * Delete unused code. 2022-02-28 10:44:41 +08:00
zhouxudong 0e15ad41b6 * Finish task #49696. 2022-02-25 16:17:40 +08:00
孙广明 8f89f4d64f Merge branch '185_sunhuawei_story_30529' into 'sprint/185' 
185 sunhuawei story 30529

See merge request easycorp/zentaopms!1958
 2022-02-25 05:45:27 +00:00
孙华伟 68ef9809dd * 2022-02-25 13:37:32 +08:00
孙广明 7ba3ed1dfc Merge branch 'spring/185_zhengrunyu_49305' into 'sprint/185' 
* Fix bug 19941 19923 19922 19787.

See merge request easycorp/zentaopms!1980
 2022-02-25 05:26:24 +00:00
孙华伟 0067119fbe *Fix bug #19959 #19963 2022-02-25 11:08:38 +08:00