Commit Graph
921 Commits
Author SHA1 Message Date
李玉春 e6c646f6bd Merge branch 'sprint/fixbug_liumengyi_2441' into 'master'
* Fix bug #2441.

See merge request easycorp/zentaopms!3198
2022-04-28 08:26:06 +00:00
liumengyi 2780f01d00 * Fix bug #2441. 2022-04-28 16:21:37 +08:00
mayue 94c3a3a270 * Fix bug #10878. 2022-04-28 07:50:01 +00:00
孙广明 8010daa536 Merge branch 'sprint/master_zhouxudong_15338' into 'master'
* Fix bug #15338.

See merge request easycorp/zentaopms!3140
2022-04-26 09:12:31 +00:00
zhouxudong 9851bc1047 * Fix bug #15338. 2022-04-26 09:10:29 +00:00
zhouxudong a55f5f9df6 * Fix bug #15338. 2022-04-26 09:03:06 +00:00
zenggang 9e1f09d37a * Fix bug#21982,21983 2022-04-26 03:25:12 +00:00
孙广明 37733991df Merge branch 'fixbug_21140' into 'master'
*Fixbug_21140

See merge request easycorp/zentaopms!3107
2022-04-25 06:42:26 +00:00
sunjun 1cf2e5e541 *Fixbug_21140 2022-04-25 13:10:55 +08:00
wangyidong 0705daa805 * adjust for performance issue. 2022-04-25 08:55:03 +08:00
caoyanyi b8c0f822d9 * Add response data. 2022-04-22 05:38:48 +00:00
王怡栋 a8983445c8 Merge branch 'master' into 'sprint/master_zhouxudong_17994'
# Conflicts:
#   module/bug/model.php
#   module/task/model.php
2022-04-13 07:52:03 +00:00
王怡栋 c273c3aefe Merge branch 'sprint/master_zhouxudong_21700' into 'master'
* Fix bug #21700.

See merge request easycorp/zentaopms!2904
2022-04-13 07:19:18 +00:00
zhouxudong dcdbf60bdf * Fix bug #17994. 2022-04-13 11:07:22 +08:00
tanghucheng 0c2c898c01 * Fix bug #21576. 2022-04-13 10:46:44 +08:00
zhouxudong 7ac526401d * Fix bug #21700. 2022-04-13 10:08:53 +08:00
zhouxudong 1dd4af6ff3 * Fix bug #17994. 2022-04-13 09:26:20 +08:00
zhouxudong 233a035b12 * Fix bug #17994. 2022-04-12 17:23:24 +08:00
zhouxudong 8baef621d2 * Fix bug #17994. 2022-04-12 16:50:56 +08:00
xieqiyu a60f498ea8 * Modify review code. 2022-04-11 17:23:59 +08:00
xieqiyu ee5d43bea9 * Fix bug#18080. 2022-04-11 08:53:28 +08:00
zhouxudong d60ce0159c * Fix bug #17994. 2022-04-08 11:15:16 +08:00
朱金勇 ecbbc59166 Merge branch 'sgm_projecttest' into 'master'
Sgm projecttest

See merge request easycorp/zentaopms!2775
2022-04-06 09:09:27 +00:00
孙广明 bd895ca244 * Add project test and fix bug. 2022-04-06 16:01:06 +08:00
xieqiyu c4e9e00959 * Fix bug#13881. 2022-04-06 09:49:30 +08:00
王怡栋 6edb5fe805 * fix bug #21413. 2022-04-02 14:44:18 +08:00
孙广明 3d2de17fff Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #11348.

See merge request easycorp/zentaopms!2648
2022-03-31 03:08:50 +00:00
zhouxudong 8efcc37f4b * Fix bug #18083. 2022-03-31 11:02:59 +08:00
xieqiyu 0983c30e8d * Fix bug#18083. 2022-03-30 17:26:17 +08:00
liyuchun 74d2ed5ea6 * Fix bug #11348. 2022-03-30 17:01:15 +08:00
zhouxudong e97eab6f68 * Fix bug #18083. 2022-03-30 08:50:14 +08:00
zhouxudong a7f9fdca86 * Fix bug #18083. 2022-03-29 14:03:53 +08:00
zhouxudong 5607b4f6c8 * Fix bug #11919. 2022-03-28 15:12:12 +08:00
zhouxudong d689db05a7 * Fix bug #11919. 2022-03-28 13:10:11 +08:00
zhouxudong 5129df89d2 * Fix bug #11919. 2022-03-28 11:11:31 +08:00
zhouxudong 0f999761c9 * Fix bug #11919. 2022-03-28 11:10:21 +08:00
zhouxudong 92648cadc8 * Fix bug #11919. 2022-03-25 15:23:15 +08:00
Wenrui LI 56053267c1 * fix where deleted condition of query. 2022-03-22 11:07:49 +08:00
Wenrui LI b232bd54fe * filter out deleted lanes, task #51311, bug #20972. 2022-03-22 10:39:28 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
孙华伟 ad8f8f5336 *Fix bug#20452 2022-03-15 08:57:34 +08:00
孙华伟 ffa6d43736 *Fix bug#20452 2022-03-14 16:10:35 +08:00
孙华伟 6d3030063f * 2022-03-14 13:11:08 +08:00
tanghucheng 477e89a09e * Fix bug. 2022-03-11 14:03:30 +08: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
孙广明 ebfdd2a742 Merge branch 'autoTest_liumengyi' into 'master'
* Add auto test for task.

See merge request easycorp/zentaopms!2159
2022-03-09 05:53:01 +00:00
liumengyi b1623bb73a * Add auto test for task. 2022-03-09 13:46:19 +08:00
zhangzilong 6327b37eae * Code for task #49888. 2022-03-09 10:41:46 +08:00
王怡栋 fb22e1dcb0 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug 50368

See merge request easycorp/zentaopms!2128
2022-03-08 07:54:22 +00:00