Commit Graph
35940 Commits
Author SHA1 Message Date
王怡栋 55ebeb33d2 Merge branch 'sprint/max41_mayue_bug#26395' into 'master'
* Fix bug #26395.

See merge request easycorp/zentaopms!4954
2022-08-12 09:06:52 +00:00
王怡栋 1f1242ca9c Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
add cp gantt task move

See merge request easycorp/zentaopms!4953
2022-08-12 09:06:24 +00:00
lanzongjun 5915e3189c add gantt move order 2022-08-12 17:04:49 +08:00
mayue f9711bc443 * Optimize code. 2022-08-12 17:04:32 +08:00
hufangzhou b1aa1f2ea6 * Add the xxc to changelog. 2022-08-12 17:00:53 +08:00
孙广明 e1b4cb821a Merge branch 'sprint/224_liumengyi_26325' into 'master'
* Fix bug #26358.

See merge request easycorp/zentaopms!4952
2022-08-12 08:52:29 +00:00
lanzongjun 0c117ef702 add gantt move order 2022-08-12 16:49:27 +08:00
王怡栋 71093a980c Merge branch 'sprint/224_dongli_bug26194' into 'master'
* Fix bug #26194.

See merge request easycorp/zentaopms!4950
2022-08-12 08:49:11 +00:00
wangyidong ab98851096 Merge branch 'sprint/224_hufangzhou_doc' 2022-08-12 16:43:33 +08:00
wangyidong a7da22c833 Merge branch 'sprint/224_hufangzhou_doc' 2022-08-12 16:42:20 +08:00
hufangzhou f28a05f25b * Add the xuanxuan update sql to standard sql. 2022-08-12 16:40:51 +08:00
mayue 4dbf6940e6 * Fix bug #26395. 2022-08-12 16:39:07 +08:00
王怡栋 38f8f8c0ba Merge branch 'master_xieqiyu_26177' into 'master'
* Fix bug#26177.

See merge request easycorp/zentaopms!4946
2022-08-12 08:19:02 +00:00
lanzongjun 886c392287 add cp gantt task move 2022-08-12 16:18:57 +08:00
王怡栋 534b2540d2 Merge branch 'sprint224_26389' into 'master'
* Fix bug#26389,26333,26328

See merge request easycorp/zentaopms!4947
2022-08-12 08:17:54 +00:00
曾刚 de80b35803 * Fix bug#26389,26333,26328 2022-08-12 08:17:54 +00:00
lanzongjun 9fa80dcd94 add cp gantt task move 2022-08-12 16:15:08 +08:00
wangyidong ab06fa28ba Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-12 16:12:08 +08:00
wangyidong 9a3513a15c * change for change table engine. 2022-08-12 16:11:35 +08:00
liumengyi b44027690c * Fix bug #26358. 2022-08-12 16:07:06 +08:00
孙广明 d7de15ae41 Merge branch 'sprint/224_liumengyi_26325' into 'master'
* Fix bug #26379.

See merge request easycorp/zentaopms!4951
2022-08-12 07:46:08 +00:00
liumengyi 8dc2999075 * Fix bug #26379. 2022-08-12 15:44:01 +08:00
dongli 8ae85f440c * Fix bug #26194. 2022-08-12 07:22:28 +00:00
hufangzhou c7f587ef5a * Fix bug #26359. Optimize detail styles for creating documents. 2022-08-12 15:05:00 +08:00
tianshujie 26085d7a41 * Operations type execution and story or design type stage do not display story field. 2022-08-12 14:56:27 +08:00
liumengyi f540e58388 * Fix bug. 2022-08-12 14:25:29 +08:00
xieqiyu 4da9aac7c3 * Fix bug#26177. 2022-08-12 13:49:10 +08:00
liumengyi 698510fadf * Fix bug #26325. 2022-08-12 13:13:38 +08:00
liumengyi c5522146da * Fix bug #26325. 2022-08-12 13:12:56 +08:00
王怡栋 9e8fddafa6 Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!4943
2022-08-12 00:49:55 +00:00
王怡栋 1c95b63d7b Merge branch 'importExport' into 'master'
* Format code for port.

See merge request easycorp/zentaopms!4944
2022-08-12 00:49:44 +00:00
zhouxudong 21866db309 * Fix bug. 2022-08-12 00:46:07 +00:00
tanghucheng baf02b5fe3 * Format code for port. 2022-08-12 08:42:01 +08:00
wangyidong 1d1379392a * adjust for merge program. 2022-08-12 08:34:37 +08:00
王怡栋 f1e13457e5 Merge branch 'sprint224_zg_26307' into 'master'
* Fix bug #26307

See merge request easycorp/zentaopms!4931
2022-08-12 00:31:55 +00:00
王怡栋 6c24a5aad1 Merge branch 'importExport' into 'master'
* Code for port.

See merge request easycorp/zentaopms!4942
2022-08-12 00:28:44 +00:00
孙广明 77b27f5eb3 Merge branch 'lyk_fixbug' into 'master'
* Fix bug of the view of admin in lite

See merge request easycorp/zentaopms!4929
2022-08-12 00:14:12 +00:00
tanghucheng 3a72c09b5c * Code for port. 2022-08-12 00:34:10 +08:00
王怡栋 d99af116f9 Merge branch 'importExport' into 'master'
* Fix bug #26324.

See merge request easycorp/zentaopms!4937
2022-08-11 09:00:13 +00:00
zhouxudong 7826781cff * Fix bug. 2022-08-11 08:53:49 +00:00
tanghucheng dd3e5483d4 * Fix bug #26324. 2022-08-11 16:41:39 +08:00
王怡栋 15d3c5f680 Merge branch 'sprint/224_dongli_bug63665' into 'master'
* Fix bug #63665.

See merge request easycorp/zentaopms!4933
2022-08-11 08:20:16 +00:00
王怡栋 821f011e90 Merge branch 'importExport' into 'master'
* Code for port.

See merge request easycorp/zentaopms!4932
2022-08-11 08:04:27 +00:00
caoyanyi 0e6bc3432e * Modify mr error. 2022-08-11 15:59:51 +08:00
tanghucheng 0562051edc Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-11 15:57:07 +08:00
dongli 4597794f91 * Fix bug #63665. 2022-08-11 07:37:20 +00:00
tanghucheng ff0ee876f0 * Code for port. 2022-08-11 15:36:26 +08:00
wangyidong 02bab0a206 Merge branch 'sprint/devplat_31' 2022-08-11 15:21:36 +08:00
liuyongkai 3d5f702b1e * Fix bug of kanban and the view of admin in lite 2022-08-11 07:19:07 +00:00
daitingting 5f9da4f6ec * Adjust upgrade version. 2022-08-11 07:17:44 +00:00