Commit Graph

29146 Commits

Author SHA1 Message Date
zhengrunyu
172b62dbfb * Fixbug 19953. 2022-02-24 11:18:44 +08:00
孙广明
e6338d280e Merge branch 'sprint/185_zhangzilong_49280' into 'sprint/185'
* Finish task #49280.

See merge request easycorp/zentaopms!1936
2022-02-24 02:46:43 +00:00
zhangzilong
861d6d3e47 * Finish task #49280. 2022-02-24 10:44:13 +08:00
zhangzilong
a68221ccaf * Finish task #49280. 2022-02-24 10:41:54 +08:00
李玉春
3762eba099 Merge branch 'sprint/185_zhengrunyu_Fixbug_19957' into 'sprint/185'
* Fix bug 19957 .

See merge request easycorp/zentaopms!1939
2022-02-24 02:41:07 +00:00
zhengrunyu
259edbbf3c * Fix bug 19957 . 2022-02-24 10:39:35 +08:00
zhangzilong
a9e3772439 * Finish task #49280. 2022-02-24 09:30:52 +08:00
xieqiyu
0678ee1fde * Fix bug#19928. 2022-02-24 08:54:08 +08:00
李玉春
ed765643ca Merge branch 'sprint/185_zxd_49289' into 'sprint/185'
Sprint/185 zxd 49289

See merge request easycorp/zentaopms!1932
2022-02-24 00:43:31 +00:00
李玉春
a04e4ec1d6 Merge branch 'sprint/185_zxd_49301' into 'sprint/185'
* Finish task #49301.

See merge request easycorp/zentaopms!1931
2022-02-24 00:42:27 +00:00
周旭东
f521758c05 Update control.php 2022-02-24 00:34:56 +00:00
李玉春
9b4fe955ea Merge branch 'sprint/185_zhouxudong_19917' into 'sprint/185'
Sprint/185 zhouxudong 19917

See merge request easycorp/zentaopms!1923
2022-02-23 09:26:48 +00:00
李玉春
e30201491d Merge branch '185_sunhuawei_story_30529' into 'sprint/185'
185 sunhuawei story 30529

See merge request easycorp/zentaopms!1929
2022-02-23 09:26:29 +00:00
周旭东
bc832bcf22 Update kanban.js 2022-02-23 09:20:20 +00:00
孙华伟
e78a9cc05a *Story #30529. 2022-02-23 17:17:28 +08:00
孙华伟
51e54dcf74 *Story #30529. 2022-02-23 17:15:56 +08:00
zhouxudong
6556130370 * Modify variable name. 2022-02-23 17:11:26 +08:00
孙广明
cca313c355 Merge branch 'sprint/186/tianshujie_upgrade' into 'sprint/185'
* Modify the issue of feature review.

See merge request easycorp/zentaopms!1925
2022-02-23 09:02:51 +00:00
tianshujie
e1e2686493 * Modify the issue of feature review. 2022-02-23 16:56:22 +08:00
李玉春
cbd1ec29ce Merge branch 'sprint/185_zhengrunyu_Fixbug_19932' into 'sprint/185'
*Fix bug 19932 .

See merge request easycorp/zentaopms!1924
2022-02-23 08:56:19 +00:00
zhouxudong
ad7d67071d * Fix bug #19917. 2022-02-23 16:50:08 +08:00
王怡栋
923741ca79 Merge branch 'sprint/185' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185 2022-02-23 16:45:09 +08:00
zhengrunyu
c07ca10dd7 *Fix bug 19932 . 2022-02-23 16:39:35 +08:00
zhujinyong
891b914fc9 * Format code. 2022-02-23 16:39:15 +08:00
zhouxudong
97e5aab33c * Fix bug #19917. 2022-02-23 16:37:44 +08:00
孙广明
914a00e83a * Code for upgrade. 2022-02-23 16:35:36 +08:00
孙华伟
234cfff784 *Story #30529. 2022-02-23 16:30:50 +08:00
李玉春
322c9c2b54 Merge branch 'sprint/185_zxd_49696' into 'sprint/185'
* Finish task #49696.

See merge request easycorp/zentaopms!1908
2022-02-23 08:11:28 +00:00
王怡栋
128f3be486 Merge branch 'sprint/185_tanghcuheng_49375' into 'sprint/185'
* Finish task #49375.

See merge request easycorp/zentaopms!1919
2022-02-23 07:59:21 +00:00
王怡栋
fe3b568a36 Merge branch 'sprint/185_lanzongjun_49334' into 'sprint/185'
* Fix bug #49334

See merge request easycorp/zentaopms!1917
2022-02-23 07:58:13 +00:00
王怡栋
c971499c52 Merge branch 'sgm_upgrade' into 'sprint/185'
Sgm upgrade

See merge request easycorp/zentaopms!1918
2022-02-23 07:51:52 +00:00
tanghucheng
f057a1b832 * Finish task #49375. 2022-02-23 15:50:46 +08:00
zhouxudong
0b891f21b6 * Finish task #49301. 2022-02-23 15:33:24 +08:00
Zongjun Lan
7a673daa6f * Fix bug #49334 2022-02-23 15:26:53 +08:00
王怡栋
ff5069a4fc Merge branch 'sprint/185_zhengrunyu_Fixmore' into 'sprint/185'
* Fixbug 19911.

See merge request easycorp/zentaopms!1916
2022-02-23 07:24:19 +00:00
孙广明
7be1378030 Merge branch 'sprint/186/tianshujie_upgrade' into 'sprint/185'
Sprint/186/tianshujie upgrade

See merge request easycorp/zentaopms!1912
2022-02-23 06:17:37 +00:00
zhengrunyu
599e94d578 * Fixbug 19911. 2022-02-23 14:12:39 +08:00
zhouxudong
bf002dcd83 * Finish task #49289. 2022-02-23 14:11:38 +08:00
tianshujie
40fec08bb5 * Modify the load module path. 2022-02-23 14:08:25 +08:00
zhujinyong
61e790f1ff Merge branch 'sprint/185' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185 2022-02-23 14:04:48 +08:00
zhujinyong
4dbd9fcae5 * Fix bug: = ? return. 2022-02-23 14:04:11 +08:00
tianshujie
20fb3044d5 * Modify the code format. 2022-02-23 13:58:50 +08:00
孙广明
0ee66db862 * Code for upgrade. 2022-02-23 13:44:09 +08:00
tianshujie
2d1c81a4fe * Modify the code format. 2022-02-23 13:42:54 +08:00
周旭东
7d6fa23ced Update taskkanban.html.php 2022-02-23 05:29:00 +00:00
周旭东
177b6005f3 Update taskkanban.html.php 2022-02-23 05:28:31 +00:00
周旭东
8b494a429d Update kanban.html.php 2022-02-23 05:27:17 +00:00
tianshujie
90bd75ea02 * Modify the style of the migration files page. 2022-02-23 13:26:45 +08:00
tianshujie
85982b6cf0 * Modify the style of the migration files page. 2022-02-23 13:21:37 +08:00
周旭东
ede11fedbe Update kanban.html.php 2022-02-23 05:21:05 +00:00