Commit Graph
33599 Commits
Author SHA1 Message Date
李玉春 fe0504586a Merge branch 'sprint/task_zhouxudong_48844' into 'master'
*Finish task #48844.

See merge request easycorp/zentaopms!1759
2022-02-11 01:08:59 +00:00
孙广明 708a08d52f Merge branch 'fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!1749
2022-02-10 06:55:10 +00:00
tanghucheng ebef99ccf6 * Fix bug. 2022-02-10 14:52:21 +08:00
zhouxudong 818bb2ef63 *Finish task #48844. 2022-02-10 14:04:19 +08:00
李玉春 3066df4c08 Merge branch 'sprint/fixbug_19368' into 'master'
Sprint/fixbug 19368

See merge request easycorp/zentaopms!1748
2022-02-10 02:54:31 +00:00
李玉春 bc4ab66cdd Merge branch 'sprint/task_zhouxudong_48843' into 'master'
*Finish task #48843.

See merge request easycorp/zentaopms!1745
2022-02-10 02:54:20 +00:00
周旭东 b533838198 Update kanban.html.php 2022-02-10 02:38:49 +00:00
zhouxudong ec73ec4f83 *Fix bug #19368. 2022-02-10 10:35:52 +08:00
王怡栋 523aa7db37 Merge branch 'sgm_fixbug' into 'master'
* Fix bug #19356.

See merge request easycorp/zentaopms!1746
2022-02-10 01:50:46 +00:00
孙广明 9748e70a31 * Fix bug #19356. 2022-02-10 09:37:34 +08:00
zhouxudong 31e2c020f7 *Finish task #48843. 2022-02-09 16:09:57 +08:00
孙广明 f653c1f1b7 Merge branch 'fixbug' into 'master'
* Fix bug .

See merge request easycorp/zentaopms!1740
2022-02-09 06:06:38 +00:00
tanghucheng 3e6e604678 * Fix bug . 2022-02-09 14:05:34 +08:00
孙广明 c2f7881b41 Merge branch 'sprint/fixbug_19293' into 'master'
Sprint/fixbug 19293

See merge request easycorp/zentaopms!1733
2022-02-09 05:05:33 +00:00
孙广明 1fb6234b75 Merge branch 'fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!1739
2022-02-09 05:05:23 +00:00
tanghucheng f1cda6821d * Fix bug. 2022-02-09 13:04:16 +08:00
孙广明 a7ef02a009 Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!1738
2022-02-09 05:02:07 +00:00
liyuchun 8ed093d0fe * Fix bug. 2022-02-09 12:59:50 +08:00
周旭东 218eab7fa1 Update execution.css 2022-02-09 02:00:31 +00:00
孙广明 274b240b08 Merge branch 'sprint/fixbug_19292' into 'master'
*Fix bug #19292.

See merge request easycorp/zentaopms!1734
2022-02-09 01:45:08 +00:00
zhouxudong c38b5803a5 *Fix bug #19292. 2022-02-09 09:24:26 +08:00
周旭东 4ec0dc2b9a Update execution.css 2022-02-09 01:13:58 +00:00
zhouxudong 87445eca72 *Fix bug #19293. 2022-02-09 09:10:41 +08:00
孙广明 ed7bf20e8b Merge branch 'sprint/fixbug_19265' into 'master'
Sprint/fixbug 19265

See merge request easycorp/zentaopms!1726
2022-02-08 08:17:34 +00:00
孙广明 531ec207f8 Merge branch 'sprint/fixbug_18593' into 'master'
Sprint/fixbug 18593

See merge request easycorp/zentaopms!1727
2022-02-08 08:17:22 +00:00
孙广明 a2195fd286 Merge branch 'fixbug' into 'master'
* Fix bug #19307.

See merge request easycorp/zentaopms!1729
2022-02-08 08:17:12 +00:00
tanghucheng fd0ee50bbe * Fix bug #19307. 2022-02-08 16:15:13 +08:00
王怡栋 11d86c13f2 Merge branch 'sgm_fixbug' into 'master'
* Fix bug close modal bug.

See merge request easycorp/zentaopms!1725
2022-02-08 07:55:16 +00:00
zhouxudong a7a720e66d *Fix bug #18593. 2022-02-08 14:13:24 +08:00
周旭东 ced8d40c6b Update model.php 2022-02-08 06:04:16 +00:00
孙广明 b46ec89098 * Fix bug close modal bug. 2022-02-08 14:01:40 +08:00
周旭东 f3eda73168 Update model.php 2022-02-08 05:49:56 +00:00
zhouxudong eaa25c2251 *Fix bug #19265. 2022-02-08 13:47:35 +08:00
孙广明 3dfc436e63 Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug #19286.

See merge request easycorp/zentaopms!1722
2022-02-08 02:13:27 +00:00
liumengyi 5f4b09f661 * Fix bug #19286. 2022-02-08 10:11:31 +08:00
孙广明 2a902a886c Merge branch 'fixbug' into 'master'
* Fix bug #19269.

See merge request easycorp/zentaopms!1719
2022-02-08 01:09:47 +00:00
zhouxudong 41c4f7135f *Fix bug #18593. 2022-02-08 09:08:15 +08:00
tanghucheng 83632f916d * Fix bug #19269. 2022-02-08 09:01:19 +08:00
孙广明 632e288d87 Merge branch 'sprint/fixbug_19266' into 'master'
*Fix bug #19266.

See merge request easycorp/zentaopms!1716
2022-02-08 00:29:17 +00:00
zhouxudong 1ea961b209 *Fix bug #19266. 2022-02-07 17:19:20 +08:00
孙广明 58ac436345 Merge branch 'sprint/183_zhouxin_fix' into 'master'
Fix bugs.

See merge request easycorp/zentaopms!1715
2022-02-07 07:43:57 +00:00
zhouxin 2ef3ad1da2 Fix bug. 2022-02-07 07:43:37 +00:00
孙广明 46d824bfb6 Merge branch 'fix_bug_17979' into 'master'
* Fix bug #17979.

See merge request easycorp/zentaopms!1714
2022-02-07 07:39:41 +00:00
zhouxin 71cd99f3e3 Fix bugs. 2022-02-07 07:38:08 +00:00
mayue c262649293 * Fix bug #17979. 2022-02-07 15:37:26 +08:00
孙广明 2ed24b51d6 Merge branch 'sprint/fixbug_13636' into 'master'
Sprint/fixbug 13636

See merge request easycorp/zentaopms!1713
2022-02-07 06:35:11 +00:00
zhouxudong e02d0152fe *Fix bug #13636. 2022-02-07 14:30:21 +08:00
孙广明 9a328b689f Merge branch 'liyuchun_fixbug' into 'master'
* Adjsut style.

See merge request easycorp/zentaopms!1708
2022-02-07 03:13:32 +00:00
孙广明 c8ce766f83 Merge branch 'fix_bug_18308' into 'master'
* Fix bug #18308.

See merge request easycorp/zentaopms!1711
2022-02-07 03:13:06 +00:00
zhouxudong 5ec1d31b76 *Fix bug #13636. 2022-02-07 11:11:48 +08:00