Commit Graph
33575 Commits
Author SHA1 Message Date
tanghucheng 32ce0200ef * Fix bug. 2022-02-09 13:24:33 +08:00
liyuchun cc392110e0 * Fix bug. 2022-02-09 13:24:33 +08:00
zhouxudong 26156f2810 *Fix bug #19292. 2022-02-09 13:24:33 +08:00
周旭东 c7ac66ea62 Update model.php 2022-02-09 13:24:33 +08:00
周旭东 d0b19ad953 Update model.php 2022-02-09 13:24:33 +08:00
zhouxudong bf80ebbc31 *Fix bug #19265. 2022-02-09 13:24:33 +08:00
zhouxudong 35a2825771 *Fix bug #18593. 2022-02-09 13:24:33 +08:00
zhouxudong b2a2bd26fc *Fix bug #18593. 2022-02-09 13:24:33 +08:00
tanghucheng d4466bc65a * Fix bug #19307. 2022-02-09 13:24:33 +08:00
孙广明 17b5477551 * Fix bug close modal bug. 2022-02-09 13:24:33 +08:00
liumengyi 89d4ae37bb * Fix bug #19286. 2022-02-09 13:24:33 +08:00
孙广明 94ccf64354 * Add merge jira. 2022-02-09 13:23:28 +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
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
李玉春 b173facd13 Merge branch 'sprint/sunhuawei_fixbug_19092' into 'master'
* Fix bug #19092.

See merge request easycorp/zentaopms!1710
2022-02-07 03:11:37 +00:00
mayue 2cc103e46f * Fix bug #18308. 2022-02-07 11:10:43 +08:00
sunhuawei 3070a90a6b * Fix bug #19092. 2022-02-07 11:05:59 +08:00
王怡栋 bc1fd93036 Merge branch 'sgm_fixbug' into 'master'
* Fix bug #19236.

See merge request easycorp/zentaopms!1709
2022-02-07 02:59:23 +00:00
孙广明 34cbc58264 * Fix bug #19236. 2022-02-07 10:53:44 +08:00
liyuchun 9ac6ee3697 * Adjsut style. 2022-02-07 10:38:38 +08:00
孙广明 6036aa18e6 Merge branch 'fix_bug_19108' into 'master'
* Fix bug #19108.

See merge request easycorp/zentaopms!1707
2022-02-07 02:03:44 +00:00
mayue 47a5831e84 * Fix bug #19108. 2022-02-07 09:42:19 +08:00
李玉春 cf3ed8984c Merge branch 'tianshujie_18175' into 'master'
* Fix bug #18175.

See merge request easycorp/zentaopms!1706
zentaopms_16.3
2022-01-29 08:45:37 +00:00
tianshujie cb14ef28d5 * Fix bug #18175. 2022-01-29 15:51:21 +08:00
李玉春 e7936ef95a Merge branch 'sprint/scx_xuanxuan_title' into 'master'
*Xuanxuan title.

See merge request easycorp/zentaopms!1705
2022-01-29 05:40:22 +00:00
songchenxuan 5847d90351 *Xuanxuan title. 2022-01-29 13:38:26 +08:00
李玉春 bc7d190e69 Merge branch 'sprint/bug_zhouxudong_19158' into 'master'
*Fix bug #19158.

See merge request easycorp/zentaopms!1704
2022-01-29 01:02:12 +00:00
zhouxudong b767d5cbeb *Fix bug #19158. 2022-01-29 08:52:31 +08:00
李玉春 a109c294c6 Merge branch 'kanban' into 'master'
* Modify create execution error.

See merge request easycorp/zentaopms!1703
2022-01-28 09:10:23 +00:00
tianshujie ca5d15f13f * Modify create execution error. 2022-01-28 17:06:43 +08:00
李玉春 58f51b83cb Merge branch 'tianshujie_kanban' into 'master'
* Modify the problem of creating a kanban error.

See merge request easycorp/zentaopms!1702
2022-01-28 08:38:02 +00:00
tianshujie 2de963346e * Modify the problem of creating a kanban error. 2022-01-28 16:31:03 +08:00
李玉春 18cd24f4e2 Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug for view kanban.

See merge request easycorp/zentaopms!1701
2022-01-28 06:56:19 +00:00
liumengyi 7b09b6daab * Fix bug for view kanban. 2022-01-28 14:50:15 +08:00
李玉春 9c75dbe856 Merge branch 'tianshujie_kanban' into 'master'
* Solve the problem of getting regional data.

See merge request easycorp/zentaopms!1700
2022-01-28 06:37:25 +00:00
tianshujie 4394d09195 * Solve the problem of getting regional data. 2022-01-28 14:31:35 +08:00
李玉春 59a33f6d1e Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug #19126.

See merge request easycorp/zentaopms!1699
2022-01-28 05:30:53 +00:00
liumengyi 06275780d2 * Modify code format. 2022-01-28 13:29:19 +08:00