Commit Graph
38974 Commits
Author SHA1 Message Date
wangyidong 55b68c8a57 * adjust for round error. 2022-05-20 15:23:02 +08:00
王怡栋 342dcd2da1 Merge branch 'tanghucheng_fixbug' into 'sprint/189_package'
* Fix bug.

See merge request easycorp/zentaopms!3543
2022-05-20 05:06:42 +00:00
唐胡成 834ffeeb1c Update lite.php 2022-05-20 05:06:24 +00:00
wangyidong 8d808c560f * fix bug. 2022-05-20 12:00:52 +08:00
tanghucheng 52e57b3f16 * Fix bug. 2022-05-20 03:54:36 +00:00
wangyidong 99f1170ca7 * cahnge can search for workflow. 2022-05-20 11:38:23 +08:00
wangyidong 2051f9a371 * code for bug #22577. 2022-05-20 10:56:23 +08:00
wangyidong a8531b8e58 * fix bug. 2022-05-20 10:40:45 +08:00
wangyidong eec42b3e57 * adjust for upgrade. 2022-05-20 09:44:43 +08:00
wangyidong e94adb7e51 * adjust for get installed version. 2022-05-20 08:33:01 +08:00
王怡栋 dd1b7b6c2f Merge branch 'fixbugg' into 'sprint/189_package'
* Fix bug.

See merge request easycorp/zentaopms!3530
2022-05-19 09:36:07 +00:00
tanghucheng 868bc4c7e0 * Fix bug. 2022-05-19 09:34:12 +00:00
李玉春 8a2a953d17 Merge branch 'sprint/189_liumengyi_22691' into 'sprint/189_package'
* Code format for bug 22691.

See merge request easycorp/zentaopms!3529
2022-05-19 09:04:00 +00:00
liumengyi 496dc6d211 * Code format for bug 22691. 2022-05-19 16:59:33 +08:00
李玉春 0378ea04aa Merge branch 'sprint/189_liumengyi_22691' into 'sprint/189_package'
* Fix bug #22691.

See merge request easycorp/zentaopms!3528
2022-05-19 08:57:46 +00:00
liumengyi 29354d4be9 * Fix bug #22691. 2022-05-19 16:48:49 +08:00
zhujinyong e07457cd29 * Update16.5. 2022-05-19 16:28:45 +08:00
wangyidong 92e8a84230 * adjust for edit project. 2022-05-19 16:15:55 +08:00
朱金勇 ea0ef0ee1a Merge branch 'sprint/189_hufangzhou_22669' into 'sprint/189_package'
* Fix bug #22669.

See merge request easycorp/zentaopms!3524
2022-05-19 08:12:42 +00:00
hufangzhou 3179fd289b * Fix bug #22669. 2022-05-19 16:10:17 +08:00
zhujinyong f5f32118e6 Merge branch 'sprint/189_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint_189 2022-05-19 15:56:45 +08:00
王怡栋 9c73e71526 Merge branch 'sprint/189_hufangzhou_22672' into 'sprint/189_package'
* Fix bug #22672.

See merge request easycorp/zentaopms!3522
2022-05-19 07:56:25 +00:00
zhujinyong e71094decc * Fix code style. 2022-05-19 15:56:19 +08:00
zhujinyong abc5364d45 Merge branch 'sprint/189_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint_189 2022-05-19 15:53:09 +08:00
zhujinyong 6f46cbfb0c * Add approval sql. 2022-05-19 15:52:41 +08:00
hufangzhou 4845901d39 * Delete the unsed code. 2022-05-19 15:52:16 +08:00
李玉春 1ada06c384 Merge branch 'sprint/189_liumengyi_fixbug' into 'sprint/189_package'
* Fix bug #22689.

See merge request easycorp/zentaopms!3521
2022-05-19 07:44:36 +00:00
hufangzhou 331e31c911 * Fix bug #22672. 2022-05-19 15:43:38 +08:00
liumengyi 47ec417f16 * Fix bug #22689. 2022-05-19 15:39:10 +08:00
wangyidong 8c4931f287 * hold files. 2022-05-19 13:49:07 +08:00
王怡栋 557304ec0b Merge branch 'sprint/189_hufangzhou_updatemax' into 'sprint/189_package'
* Add the upgrade program of max.

See merge request easycorp/zentaopms!3510
2022-05-19 05:34:50 +00:00
wangyidong f289e08b9d * use buildOperateMenu method for build and projectrelease module. 2022-05-19 13:34:02 +08:00
hufangzhou c1186efeda * Add the upgrade program of max. 2022-05-19 13:07:30 +08:00
王怡栋 8e0d809caa Merge branch 'sprint/daitingting_189_package' into 'sprint/189_package'
* Add relations params for buildActionMenu.

See merge request easycorp/zentaopms!3486
2022-05-19 00:58:05 +00:00
王怡栋 1390db9b95 Merge branch 'sprint/189_hufangzhou_22637' into 'sprint/189_package'
* Fix bug #22637.

See merge request easycorp/zentaopms!3492
2022-05-19 00:56:19 +00:00
hufangzhou 82c4eba324 * Fix bug #22637. 2022-05-18 16:36:34 +08:00
daitingting cd6698cc9b * Add relations params for buildActionMenu. 2022-05-18 07:38:45 +00:00
wangyidong 13202156b3 * fix bug #22631. 2022-05-18 15:18:40 +08:00
王怡栋 0f6e2aca05 Merge branch 'sprint/189_hufangzhou_changelog' into 'sprint/189_package'
* Add the changelog.

See merge request easycorp/zentaopms!3482
2022-05-18 06:19:50 +00:00
hufangzhou bf2756a2e2 * Add the changelog. 2022-05-18 14:18:23 +08:00
王怡栋 276d1b2197 Merge branch 'sprint/189_package_lanzongjun' into 'sprint/189_package'
* fix bug #22570

See merge request easycorp/zentaopms!3477
2022-05-18 05:35:22 +00:00
lanzongjun 867152e2bc * fix bug #22570 2022-05-18 13:33:54 +08:00
lanzongjun ece8976470 * fix bug #22570 2022-05-18 13:20:43 +08:00
wangyidong cceff98fd5 * Add id for post data. 2022-05-18 10:47:23 +08:00
王怡栋 94f34f045f Merge branch 'sprint/189_wangyuting_fixbug#22573' into 'sprint/189_package'
* Fix bug #22573.

See merge request easycorp/zentaopms!3464
2022-05-18 01:51:43 +00:00
wangyuting2 04041e6fb5 * Fix bug #22572. 2022-05-18 09:41:15 +08:00
wangyuting2 af47d16938 * Fix bug #22573. 2022-05-18 09:27:14 +08:00
孙广明 d6a88be36e Merge branch 'cherry-pick-67052054' into 'sprint/189_package'
Merge branch 'sprint/wangyuting_fixbug_22520' into 'master'

See merge request easycorp/zentaopms!3457
2022-05-18 00:47:35 +00:00
王怡栋 5278958100 Merge branch 'sprint/189_package_lanzongjun' into 'sprint/189_package'
* fix bug #22570

See merge request easycorp/zentaopms!3459
2022-05-18 00:43:53 +00:00
lanzongjun 6e0e9d2348 * fix bug #22570 2022-05-18 08:43:08 +08:00