Commit Graph
1268 Commits
Author SHA1 Message Date
王怡栋 a4c8a5334e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-19 15:13:01 +08:00
王怡栋 657a8f50ef * fix bug for sql. 2022-04-19 15:12:31 +08:00
xieqiyu 205e3126ad * Fix bug#19379. 2022-04-18 15:09:49 +08:00
王怡栋 8f11396658 Merge branch 'fixbug' into 'master'
* Fix bug #17634.

See merge request easycorp/zentaopms!2962
2022-04-15 06:42:32 +00:00
tanghucheng 9761644a92 * Fix bug #17634. 2022-04-15 14:41:18 +08:00
sunjun 2a1932ebac *Fixbug_sunjun__21501 2022-04-14 13:46:17 +08:00
王怡栋 c662476270 * add index for zt_stakeholder table. 2022-04-14 10:01:46 +08:00
hufangzhou 80df716a0a * Modify the product field type of zt_action and zt_effort because the current length is not enough. 2022-04-13 16:46:55 +08:00
Zongjun Lan e13c17216a * modify sql 2022-04-13 14:48:05 +08:00
Zongjun Lan 486295dcc1 * fix bug *20169 2022-04-13 10:28:29 +08:00
Wenrui LI 54d333d800 * change zt_file.title to varchar. 2022-04-08 13:07:28 +08:00
tianshujie f4fd8bbf37 * Fix bug #21159. 2022-04-07 14:13:24 +08:00
tanghucheng b352dc9a86 * Fix bug. 2022-04-02 15:17:17 +08:00
王怡栋 4fa721b0bb Merge branch '165_package' 2022-04-01 15:30:36 +08:00
tanghucheng c8a412287d * Fix bug . 2022-03-30 17:05:01 +08:00
tanghucheng f1449d3b6b * Fix bug. 2022-03-30 09:09:04 +08:00
liyuchun 94d0076249 * Fix error when import demo in alm. 2022-03-29 17:14:03 +08:00
zhujinyong be75d25da7 * Fix api doc. 2022-03-29 09:25:15 +08:00
tanghucheng dd13984197 * Fix bug #21211. 2022-03-28 10:42:08 +08:00
tanghucheng 447f0360c5 * Fix bug #21009,21211. 2022-03-28 10:36:22 +08:00
hufangzhou 11e151a6fa * Add the new version. 2022-03-24 10:48:05 +08:00
李玉春 e59d22f222 Merge branch 'mayue_fix_bug#20645' into 'master'
* Fix bug #20645.

See merge request easycorp/zentaopms!2427
2022-03-22 02:51:35 +00:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
liyuchun 0187fb80c7 Merge branch 'devops24' 2022-03-22 08:28:32 +08:00
tanghucheng 3bda7c38aa * Fix bug for upgrade. 2022-03-21 16:07:03 +08:00
zenggang 70d00fad9e * Code for task#50697,50685 2022-03-17 03:07:38 +00:00
hufangzhou 8011a9dc0e * Fix sql. 2022-03-17 10:05:40 +08:00
zhujinyong 56c0ef9064 * Fix sql. 2022-03-16 13:38:33 +08:00
孙广明 4cc13f3b13 Merge branch 'pailei2_mayue_bug#17576' into 'pailei2'
* Revert code.

See merge request easycorp/zentaopms!2296
2022-03-16 05:10:42 +00:00
mayue bff6607776 * Revert code. 2022-03-16 13:05:31 +08:00
zhujinyong 489be02f3f * Fix review. 2022-03-16 12:11:09 +08:00
tanghucheng b9542612cb * Fix bug. 2022-03-16 09:51:36 +08:00
孙广明 c498c964ba * Change version. 2022-03-16 08:35:21 +08:00
李玉春 e700b4414a Merge branch 'pailei2_mayue_bug#17576' into 'pailei2'
* Fix bug #17576.

See merge request easycorp/zentaopms!2279
2022-03-15 09:15:40 +00: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
mayue 405e26a93d * Fix bug #17576. 2022-03-15 13:39:16 +08:00
孙广明 fa3c92e03f Merge branch 'master' into 'sprint/master_tanghucheng_fix'
# Conflicts:
#   db/update16.4.sql
2022-03-15 05:13:52 +00:00
tanghucheng 771cde761c * Fix bug #20757. 2022-03-15 13:09:24 +08:00
zhujinyong 841897faca Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-15 12:24:24 +08:00
zhujinyong 28c73c8ec6 * Fix error of task api. 2022-03-15 12:23:57 +08:00
xieqiyu 6188802ae4 * Fix bug#20111. 2022-03-15 11:08:48 +08:00
孙广明 71f49f171f Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!2246
2022-03-14 09:10:18 +00:00
tanghucheng 64f44170e5 * Fix bug. 2022-03-14 16:58:34 +08:00
孙广明 37153ad060 * Fix bug #20725 2022-03-14 16:34:49 +08:00
mayue 5c3395ee46 * Fix bug #20645. 2022-03-14 16:17:51 +08:00
zhujinyong 976299d506 * Fix type of fields. 2022-03-14 15:12:32 +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
孙广明 16bfad8acd Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug for priv.

See merge request easycorp/zentaopms!2226
2022-03-14 03:31:17 +00:00