Commit Graph
28649 Commits
Author SHA1 Message Date
李玉春 76bbef3f01 Merge branch 'sprint/170_songchenxuan_15695' into 'sprint/170'
* Fix bug #15695.

See merge request easycorp/zentaopms!300
2021-11-04 01:56:48 +00:00
root f79d676ad3 * Fix bug #15695 2021-11-04 09:51:54 +08:00
root 66f83b187d * Fix bug #15695 2021-11-04 09:50:51 +08:00
root 4dc9c7c5df * Fix bug #15695 2021-11-04 09:33:56 +08:00
root eafd443fca * Fix bug #15695 2021-11-04 09:31:17 +08:00
李玉春 e951745a7e Merge branch 'sprint/170_mayue_12047' into 'sprint/170'
* Fix bug #12047.

See merge request easycorp/zentaopms!298
2021-11-04 01:17:07 +00:00
mayue cb6a36fd4b * Fix bug #12047. 2021-11-04 08:54:25 +08:00
mayue f123cdefc1 * Fix bug #12047. 2021-11-04 08:18:20 +08:00
李玉春 11fc599508 Merge branch 'sprint/170_mayue_15973' into 'sprint/170'
* Fix bug #15973.

See merge request easycorp/zentaopms!291
2021-11-03 08:52:18 +00:00
李玉春 c91536aea4 Merge branch 'sprint/170_songchenxuan_15689' into 'sprint/170'
* Fix bug #15689

See merge request easycorp/zentaopms!292
2021-11-03 08:10:57 +00:00
李玉春 bf89b952d9 Merge branch 'sprint/170_dingna_task_43900' into 'sprint/170'
* Finish task#43900.

See merge request easycorp/zentaopms!286
2021-11-03 08:10:42 +00:00
李玉春 0ce134c1e4 Merge branch 'sprint/170_tianshujie_43907' into 'sprint/170'
* Finish task #43907.

See merge request easycorp/zentaopms!293
2021-11-03 08:07:55 +00:00
dingna 2dd70ed7e4 * Finish task#43900. 2021-11-03 16:02:06 +08:00
tianshujie d297c809b3 * Finish task #43907. 2021-11-03 15:51:04 +08:00
root 02c2f5e2e2 * Fix bug #15689 2021-11-03 15:45:26 +08:00
mayue fb9bc91030 * Fix bug #15973.* Fix bug #15973.* Fix bug #15973.* Fix bug #15973.* Fix bug #15973.* Fix bug #15973.* Fix bug #15973.* Fix bug #15973. 2021-11-03 15:38:49 +08:00
李玉春 c3a2ed73ba Merge branch 'sprint/170_zhouxin_43875' into 'sprint/170'
Finish task #43875.

See merge request easycorp/zentaopms!290
2021-11-03 07:38:21 +00:00
zhouxin b5d3e49e80 Finish task #43875. 2021-11-03 15:22:31 +08:00
李玉春 01e30c4dbd Merge branch 'sprint/170_mayue_15780' into 'sprint/170'
* Fix bug #15780.

See merge request easycorp/zentaopms!288
2021-11-03 07:18:17 +00:00
李玉春 961a683fcb Merge branch 'sprint/170_songchenxuan_15691' into 'sprint/170'
* Fix bug #15691.

See merge request easycorp/zentaopms!289
2021-11-03 07:17:40 +00:00
root 30c118cd9a * Fix bug #15691 2021-11-03 15:06:36 +08:00
mayue c916df0117 * Fix bug #15780. 2021-11-03 15:05:44 +08:00
mayue be67b785b3 * Fix bug #15780. 2021-11-03 14:50:48 +08:00
root 8fb62009f4 * Fix bug #15691. 2021-11-03 14:45:14 +08:00
dingna 7b19208c1b * Finish task#43900. 2021-11-03 13:50:07 +08:00
hufangzhou 8b1b92bdfc * Add the version. zentaopms_15.7.1_20211102 2021-11-02 12:37:51 +08:00
王怡栋 f8e3ffe97b Merge branch 'sprint/169' 2021-11-02 09:54:05 +08:00
李玉春 07581624f2 Merge branch 'sprint/169_hufangzhou_bug' into 'sprint/169'
* Fix bug #15838.

See merge request easycorp/zentaopms!271
2021-11-02 01:00:26 +00:00
hufangzhou 70c21e6a28 * Fix bug #15838. 2021-11-02 08:56:20 +08:00
李玉春 67743d72d9 Merge branch 'sprint/169_songchenxuan_15784' into 'sprint/169'
Sprint/169 songchenxuan 15784

See merge request easycorp/zentaopms!267
2021-11-01 09:22:43 +00:00
root 1c4ceda168 Fix bug 15784 2021-11-01 17:19:25 +08:00
root 1aac9130a4 Fix bug 15784 2021-11-01 17:16:28 +08:00
root 69287cea22 Fix bug 15784 2021-11-01 17:06:51 +08:00
root 8101f661ab Fix bug 15784 2021-11-01 17:01:13 +08:00
root 01656fd005 Fix bug 15784 2021-11-01 16:59:27 +08:00
李玉春 771de2c02e Merge branch 'sprint/169_xieqiyu_15716' into 'sprint/169'
* Fix bug#15716.

See merge request easycorp/zentaopms!265
2021-11-01 08:42:37 +00:00
xieqiyu 00d83c729c * Fix bug#15716. 2021-11-01 16:40:18 +08:00
root 7f9028691c Fix bug 15784 2021-11-01 16:20:56 +08:00
王怡栋 46f2aecae3 Merge branch 'sprint/167' 2021-11-01 15:27:58 +08:00
孙广明 d77254c662 Merge branch 'sprint/169_zhengrunyu_43708' into 'sprint/169'
*Finish task #43708.

See merge request easycorp/zentaopms!255
2021-11-01 07:26:28 +00:00
王怡栋 a2ca4f646f Merge branch '15.6' 2021-11-01 15:23:15 +08:00
zhengrunyu 4f5c9691a3 *Finish task #43708. 2021-11-01 14:12:39 +08:00
zhengrunyu d7418db734 *Finish task #43708. 2021-11-01 14:07:11 +08:00
李玉春 d4fdd7b9e2 Merge branch 'sprint/169_tianshujie_43621' into 'sprint/169'
* Finish task #43621.

See merge request easycorp/zentaopms!249
2021-11-01 02:45:38 +00:00
孙广明 da02aa3742 Merge branch 'sprint/169_zhengrunyu_43708' into 'sprint/169'
* Finish task #43708.

See merge request easycorp/zentaopms!248
2021-11-01 02:40:36 +00:00
zhengrunyu 594eae2a3f * Finish task #43708. 2021-11-01 10:33:20 +08:00
zhengrunyu bd765c6881 * Finish task #43708. 2021-11-01 10:27:34 +08:00
孙广明 39cdb1dc32 Merge branch 'sprint/169_zhouxin_43556' into 'sprint/169'
Finish task #43556.

See merge request easycorp/zentaopms!232
2021-11-01 02:27:17 +00:00
tianshujie 96513f604e * Modify and maintain product line logic. 2021-11-01 10:21:11 +08:00
tianshujie f78f9ecdfe * Finish task #43621. 2021-11-01 10:18:21 +08:00