Commit Graph
48007 Commits
Author SHA1 Message Date
wangzemei e3ac1759e4 * fix bug 29616 2022-11-21 15:23:27 +08:00
孙广明 caa27cbfab Merge branch 'master_xieqiyu_76416' into 'master'
* Fix bug#29789.

See merge request easycorp/zentaopms!6284
2022-11-21 07:17:33 +00:00
Yagami cac547b21a * Finish task #76948. 2022-11-21 15:11:44 +08:00
xieqiyu 80e19fe5e1 * Fix bug#29789. 2022-11-21 14:57:58 +08:00
Yagami d2c3dbd5d0 * Finish task #76949. 2022-11-21 14:39:01 +08:00
Yagami 07b30d1f7c * Finish task #76953. 2022-11-21 14:22:42 +08:00
王怡栋 7a47096356 * fix bug #30007. 2022-11-21 14:10:53 +08:00
孙广明 8dc4ded8d3 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix bug #30022

See merge request easycorp/zentaopms!6273
2022-11-21 05:48:10 +00:00
孙广明 074d4c0e78 Merge branch 'master_bug_#29980' into 'master'
* Fix bug #29980.

See merge request easycorp/zentaopms!6274
2022-11-21 05:47:34 +00:00
刘刚 ebe6da02b7 Merge branch 'dht.unittest' into 'master'
Add repo unittest.

See merge request easycorp/zentaopms!5698
2022-11-21 05:40:00 +00:00
王怡栋 b816b78e4a Merge branch 'tanghucheng_fixbug' into 'master'
* Fix bug #30011.

See merge request easycorp/zentaopms!6272
2022-11-21 05:27:54 +00:00
王怡栋 223546510d Merge branch 'zentaopms_263_bug#29561' into 'master'
* Fix bug #29561.

See merge request easycorp/zentaopms!6270
2022-11-21 05:27:16 +00:00
王怡栋 3370266e03 Merge branch 'zentaopms_263_bug#28274' into 'master'
* Fix bug #28274.

See merge request easycorp/zentaopms!6267
2022-11-21 05:26:39 +00:00
王怡栋 26d0d54c22 Merge branch 'zentaopms_263_bug#30000' into 'master'
* Fix bug #30000.

See merge request easycorp/zentaopms!6266
2022-11-21 05:26:23 +00:00
王怡栋 2fb3ed6fd9 Merge branch 'zentaopms_263_bug_subprogram' into 'master'
* Display all products of the top program.

See merge request easycorp/zentaopms!6265
2022-11-21 05:26:07 +00:00
王怡栋 2020fd2ae7 Merge branch 'zentaopms_263_bug#30003' into 'master'
* Fix bug #30003.

See merge request easycorp/zentaopms!6264
2022-11-21 05:25:28 +00:00
王怡栋 111f145d61 * fix bug #29953. 2022-11-21 13:23:13 +08:00
wangjianhua 902a88f0e3 * Fix bug #29980. 2022-11-21 11:31:06 +08:00
王怡栋 3852627523 * fix bug #29557. 2022-11-21 11:30:59 +08:00
lanzongjun cbd21480af * Fix bug #30022 2022-11-21 11:22:59 +08:00
tanghucheng bacdc498f8 * Fix bug #30011. 2022-11-21 11:19:59 +08:00
孙广明 cfc43ece4f Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix task #76483

See merge request easycorp/zentaopms!6271
2022-11-21 02:59:58 +00:00
lanzongjun 8b84363de8 * Fix task #76483 2022-11-21 10:58:48 +08:00
王怡栋 d9e22f5976 * fix bug #29670. 2022-11-21 10:48:07 +08:00
孙广明 6d9a360ef2 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix task #76458

See merge request easycorp/zentaopms!6269
2022-11-21 02:38:46 +00:00
wangyuting bddf9e6602 * Fix bug #29561. 2022-11-21 02:37:08 +00:00
lanzongjun 4dce7205ac * Fix task #76458 2022-11-21 10:36:28 +08:00
孙广明 34160ea306 Merge branch 'master_xieqiyu_76492' into 'master'
* Fix bug#29461.

See merge request easycorp/zentaopms!6263
2022-11-21 02:28:19 +00:00
孙广明 47796aa876 Merge branch 'sprint/zentaopms262_mayue_bug#29684' into 'master'
* Fix bug #29684.

See merge request easycorp/zentaopms!6268
2022-11-21 02:28:08 +00:00
mayue d0908ccdde * Fix bug #29684. 2022-11-21 10:26:37 +08:00
wangyuting 5811dc886d * Fix bug #28274. 2022-11-21 02:23:48 +00:00
Yagami 66bc58139f * Finish task #76486. 2022-11-21 10:23:28 +08:00
wangyuting f7d7f68fc9 * Fix bug #30000. 2022-11-21 02:18:59 +00:00
daitingting 84b1383820 * Display all products of the top program. 2022-11-21 02:12:42 +00:00
wangyuting 182f1abc9a * Fix bug #30003. 2022-11-21 01:51:24 +00:00
xieqiyu bdb570c00e * Fix bug#29461. 2022-11-21 09:43:56 +08:00
Yagami 8f62d5e947 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-21 09:31:24 +08:00
Yagami adb1434d5b * Finish task #76491. 2022-11-21 09:31:09 +08:00
王怡栋 e993d07670 * fix bug for show build. 2022-11-21 09:29:19 +08:00
王怡栋 e55339258b Merge branch 'master_feedback_1353' into 'master'
* Resolved feedback #1353.

See merge request easycorp/zentaopms!6015
2022-11-21 01:16:39 +00:00
王怡栋 68e6f5695f Merge branch 'master_feedback_1468' into 'master'
* Adjust code for feedback #1468.

See merge request easycorp/zentaopms!6261
2022-11-21 00:53:18 +00:00
王怡栋 e1a7dfb06e Merge branch 'sprint/hufangzhou_sql' into 'master'
* Adjust the standard sql.

See merge request easycorp/zentaopms!6262
2022-11-21 00:51:03 +00:00
hufangzhou 16df34b4ae * Adjust the standard sql. 2022-11-21 00:40:29 +00:00
liuhong efb20b02d8 * Adjust code for feedback #1468. 2022-11-21 00:01:24 +00:00
孙广明 9ec22b0b7d Merge branch 'sprint/zentaopms262_mayue_bug#29687' into 'master'
* Fix bug #29687.

See merge request easycorp/zentaopms!6259
2022-11-18 11:23:39 +00:00
王怡栋 40e9827d45 Merge branch 'tianshujie_fixbug' into 'master'
Tianshujie fixbug

See merge request easycorp/zentaopms!6260
2022-11-18 08:29:41 +00:00
王怡栋 1db91b628a Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix bug #29442#29695

See merge request easycorp/zentaopms!6258
2022-11-18 08:28:55 +00:00
mayue d264eb022c * Fix bug #29687. 2022-11-18 16:25:18 +08:00
王怡栋 29cddd773a * fix bug #75779. 2022-11-18 16:25:14 +08:00
lanzongjun 8ef4f02bf8 * Fix bug #29442#29695 2022-11-18 15:38:59 +08:00