Commit Graph
29743 Commits
Author SHA1 Message Date
孙广明 c498c964ba * Change version. 2022-03-16 08:35:21 +08:00
孙广明 69c22ecbf3 Merge branch 'sprint/master_tanghucheng_fix' into 'master'
* Fix bug #20779,20782,20783.

See merge request easycorp/zentaopms!2275
2022-03-15 08:34:33 +00:00
tanghucheng 72095bf38a * Fix bug #20803. 2022-03-15 16:31:27 +08:00
tanghucheng 88230cd949 * Fix bug #20779,20782,20783. 2022-03-15 15:49:25 +08:00
王怡栋 78de67f523 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-15 14:31:51 +08:00
王怡栋 9ffa55da56 * fix bug #20682. 2022-03-15 14:31:01 +08:00
王怡栋 286aa9c7d0 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #19535

See merge request easycorp/zentaopms!2260
2022-03-15 03:29:28 +00:00
王怡栋 2ae8b25fa9 Merge branch 'sprint/master_tanghucheng_fix' into 'master'
* Fix bug #20754,20776,20759.

See merge request easycorp/zentaopms!2262
2022-03-15 03:27:08 +00:00
tanghucheng 9cffc3bcf7 * Fix bug #20754,20776,20759. 2022-03-15 11:13:26 +08:00
Zongjun Lan 5be25315f3 * fix bug #19535 2022-03-15 11:10:30 +08:00
tianshujie 305ec3c69a * Modify code location. 2022-03-15 09:57:56 +08:00
tianshujie ffe15a3b23 * Fix bug #20751. 2022-03-15 09:54:53 +08:00
tianshujie ff24c06fc9 * Modify the code judgment logic. 2022-03-15 09:41:54 +08:00
tianshujie 91e99b699b * Fix bug #20751. 2022-03-15 09:36:13 +08:00
王怡栋 c5d1d463a8 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20703,#19430

See merge request easycorp/zentaopms!2235
2022-03-15 00:58:13 +00:00
王怡栋 e2fad711b4 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-14 17:28:35 +08:00
王怡栋 3c1865c527 * adjust code for order by. 2022-03-14 17:28:14 +08:00
tianshujie 3c25a51bf2 * Fix bug #20738. 2022-03-14 16:59:51 +08:00
tianshujie 937c1a64ab * Fix the problem that professional R&D Kanban does not have permission to view. 2022-03-14 16:49:46 +08:00
孙广明 287c8f7b86 Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Modify the problem of deleting two out file commands.

See merge request easycorp/zentaopms!2238
2022-03-14 08:13:32 +00:00
王怡栋 8bc5c57b78 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-14 16:09:24 +08:00
王怡栋 c1f3258a74 * adjust for get dynamic. 2022-03-14 16:08:58 +08:00
tianshujie 531422c8a0 * Modify the problem of deleting two out file commands. 2022-03-14 16:07:45 +08:00
孙广明 2e83840675 Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug #19820,20528.

See merge request easycorp/zentaopms!2233
2022-03-14 08:03:51 +00:00
Zongjun Lan 3d936d7dc8 * fix bug #20703 2022-03-14 15:43:15 +08:00
tanghucheng d32f3d2664 * Fix bug #19820,20528. 2022-03-14 14:51:03 +08:00
朱金勇 0ba0e25d66 Merge branch 'sgm_upgrade' into 'master'
* Fix upgrade bug.

See merge request easycorp/zentaopms!2230
2022-03-14 06:36:24 +00:00
孙广明 140c7652ad * Fix upgrade bug. 2022-03-14 14:23:19 +08:00
zhujinyong b5da3ce7d5 * Execute xuanxuan update sql. 2022-03-14 13:55:52 +08:00
孙广明 1beb9196e3 * Fix upgrade bug. 2022-03-14 11:30:04 +08:00
zhujinyong 32d12d4ef2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-14 10:35:18 +08:00
zhujinyong 7a3e077afa * The setting of system.common has no vision. 2022-03-14 10:34:47 +08:00
孙广明 87458bc808 Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug #20702,20698,20642.

See merge request easycorp/zentaopms!2223
2022-03-14 02:13:14 +00:00
hufangzhou c402f35eda * Fix bug #20704. 2022-03-14 10:08:25 +08:00
tanghucheng a25fd822bd * Fix bug #20702,20698,20642. 2022-03-14 09:55:44 +08:00
hufangzhou 8187472563 * Fix bug #20665. 2022-03-14 09:06:42 +08:00
tianshujie 56c5c966ea * Modify the problem that the execution label cannot be fully displayed. 2022-03-14 08:55:39 +08:00
王怡栋 49218a4097 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* code format

See merge request easycorp/zentaopms!2215
2022-03-14 00:26:35 +00:00
zhujinyong ee8298f9f6 * Check login. 2022-03-13 23:57:59 +08:00
zhujinyong 7f32ac7f61 * Fix error when updating. 2022-03-13 22:30:40 +08:00
zhujinyong 12ed4a79b3 * Fix upgrade. 2022-03-13 19:19:13 +08:00
孙广明 6a6af4e1a2 * Fix weekly bug. 2022-03-13 15:08:54 +08:00
Zongjun Lan 9b8f238779 * code format 2022-03-11 17:31:31 +08:00
王怡栋 e56cf08647 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20640,#20647

See merge request easycorp/zentaopms!2210
2022-03-11 09:29:56 +00:00
Zongjun Lan 22c49a0949 * fix bug #20647 2022-03-11 16:29:00 +08:00
zhujinyong abb301884f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-11 15:55:03 +08:00
zhujinyong bebc33acb4 * Fix bug#20651. 2022-03-11 15:54:36 +08:00
孙广明 3a491529c7 Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!2213
2022-03-11 07:50:07 +00:00
tanghucheng fb78d74984 * Fix bug. 2022-03-11 15:48:25 +08:00
zhujinyong ad46d46e81 * Fix comment. 2022-03-11 15:28:43 +08:00