Commit Graph
293 Commits
Author SHA1 Message Date
李玉春 7f098934f8 Merge branch 'devops_mr_unit' into 'master'
* Add mr create unit test and adjust code

See merge request easycorp/zentaopms!919
2021-12-14 06:10:24 +00:00
朱金勇 efdadc07a7 Merge branch 'sprint/176_mayue_45544' into 'master'
* Finish a task #45544.

See merge request easycorp/zentaopms!928
2021-12-14 05:34:42 +00:00
mayue 77d36b7467 * Finish a task #45544. 2021-12-14 09:49:46 +08:00
李玉春 fb6f913229 Merge branch 'sprint/devops16_wangyidong_test' into 'master'
* code for bug #17445.

See merge request easycorp/zentaopms!920
2021-12-14 01:47:24 +00:00
王怡栋 1bc35c32c4 * code for task #17444. 2021-12-14 09:13:50 +08:00
王怡栋 98a46445b3 * code for bug #17445. 2021-12-13 17:24:52 +08:00
zenggang a34c753438 * Add mr create unit test and adjust code 2021-12-13 09:08:00 +00:00
李玉春 47c4b4e526 Merge branch 'sprint/devops16_wangyidong_test' into 'master'
* code for bug #17438.

See merge request easycorp/zentaopms!915
2021-12-13 08:10:11 +00:00
王怡栋 69023a52bc * code for bug #17438. 2021-12-13 15:24:04 +08:00
李玉春 fd6cc79ea0 Merge branch 'sprint/devops16_17391' into 'master'
* Fix bug#17391

See merge request easycorp/zentaopms!907
2021-12-13 05:51:46 +00:00
liyuchun 4ecc85aa0e Merge branch 'devops16' 2021-12-13 12:12:37 +08:00
李玉春 edfb34b749 Merge branch 'sprint/devops16_wangyidong_test' into 'sprint/devops16'
Sprint/devops16 wangyidong test

See merge request easycorp/zentaopms!902
2021-12-13 03:28:33 +00:00
zenggang 5726fde3d6 * Fix bug#17391 2021-12-13 03:12:21 +00:00
王怡栋 9fd77be3ef * adjust for upgrade. 2021-12-10 15:44:35 +08:00
李玉春 fec4ab4604 Merge branch 'sprint/devops16_wangyidong_test' into 'sprint/devops16'
Sprint/devops16 wangyidong test

See merge request easycorp/zentaopms!888
2021-12-10 07:06:16 +00:00
王怡栋 c0ce88d4fb * fix bug #17352,17349,17347,17346. 2021-12-10 14:02:17 +08:00
王怡栋 bfcb3deb8e * code for task #45676. 2021-12-10 13:30:07 +08:00
liyuchun d121e2e01a * Fix bug #17293. 2021-12-10 10:11:56 +08:00
李玉春 8e4803745c Merge branch 'sprint/devops16_45445' into 'sprint/devops16'
* Adjust code

See merge request easycorp/zentaopms!867
2021-12-10 01:02:17 +00:00
liyuchun ddc651efbb * Code for task #45445. 2021-12-10 09:01:31 +08:00
王怡栋 760cfb42be Merge branch 'sprint/devops_liyuchun_45441' into 'sprint/devops16'
* Finish task #45439.

See merge request easycorp/zentaopms!852
2021-12-09 09:24:55 +00:00
zenggang dcc9200457 * Adjust code 2021-12-09 09:01:02 +00:00
李玉春 730e5f6491 Merge branch 'sprint/devops16_17141' into 'sprint/devops16'
* Fix bug#17141

See merge request easycorp/zentaopms!861
2021-12-09 08:38:47 +00:00
李玉春 0ebff09658 Merge branch 'sprint/devops16_wangyidong_45504' into 'sprint/devops16'
Sprint/devops16 wangyidong 45504

See merge request easycorp/zentaopms!857
2021-12-09 07:56:27 +00:00
王怡栋 dc7416ebb4 * adjust code for mr. 2021-12-09 15:54:41 +08:00
zenggang fe5571a0ed * Fix bug#17141 2021-12-09 07:46:07 +00:00
王怡栋 cb6dbdf1d1 * fix error for task #45504. 2021-12-09 14:42:14 +08:00
王怡栋 973bb32da4 * fix error. 2021-12-09 13:30:48 +08:00
王怡栋 cc682f7953 * fix error. 2021-12-09 13:24:00 +08:00
王怡栋 beadf58834 * adjust for bug type for mr. 2021-12-09 13:04:26 +08:00
liyuchun 07ce01bda2 * Finish task #45439. 2021-12-09 12:28:32 +08:00
王怡栋 f1689b4dea * code for task #45504. 2021-12-09 11:24:14 +08:00
zenggang 4061d19777 * Finish task#45445 2021-12-08 06:53:11 +00:00
zenggang d5d7e8a578 * Finish task#45440 2021-12-08 05:26:59 +00:00
mayue 99e725ef37 * Finish task #45544. 2021-12-08 13:25:50 +08:00
liyuchun 8d32dd3cf1 * Finish task #45446. 2021-12-08 10:02:21 +08:00
hufangzhou d876550d96 * Add the traditional Chinese language item. 2021-12-07 09:22:58 +08:00
孙广明 69304124b5 * Change for upgrade. 2021-12-06 10:58:52 +08:00
zenggang 7248447ed7 * Fix bug#16786,16981 2021-12-03 06:59:44 +00:00
李玉春 0f2ea93509 Merge branch 'devops_16884' into 'master'
* Fix bug#16884,16856

See merge request easycorp/zentaopms!758
2021-12-03 05:22:07 +00:00
zenggang f619cf0341 * Adjust mr view button 2021-12-03 03:09:37 +00:00
zenggang 4b53f349df * Fix bug#16736,17037,16844 2021-12-03 01:59:04 +00:00
孙广明 32ec141d3d Merge branch 'sprint/devops_liyuchun_bug' into 'master'
* Adjust style.

See merge request easycorp/zentaopms!750
2021-12-03 01:04:19 +00:00
zenggang 42a5e9bf78 * Fix bug#16884,16856 2021-12-02 09:32:45 +00:00
liyuchun 2b331d987d * Fix bug #16885. 2021-12-02 16:00:32 +08:00
liyuchun 9c9756bdd8 * Fix bug #16853. 2021-12-02 15:53:06 +08:00
李玉春 db897d851d Merge branch 'devops_16765' into 'master'
* Fix bug#16765,16771

See merge request easycorp/zentaopms!746
2021-12-02 07:41:47 +00:00
liyuchun da73e10709 * Fix bug #16856. 2021-12-02 15:32:27 +08:00
zenggang a48f584ca8 * Fix bug#16765,16771 2021-12-02 07:14:31 +00:00
liyuchun c943151157 * Fix bug #16847. 2021-12-02 14:28:50 +08:00