Commit Graph
1297 Commits
Author SHA1 Message Date
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
liyuchun 7e02324b22 * Fix bug #27253. 2022-11-04 15:17:49 +08:00
wangyidong 7cd735d1e0 * code for task #28138. 2022-11-02 16:05:05 +08:00
wangyidong 4a0a5649a0 * adjust code. 2022-11-02 09:16:51 +08:00
wangyidong 9aea6ec0fe * code for task #73995. 2022-11-01 16:38:26 +08:00
王怡栋 11fa395ed1 Merge branch 'master_feedback_1049' into 'master'
Master feedback 1049

See merge request easycorp/zentaopms!5944
2022-11-01 05:31:20 +00:00
wangyidong 40e20fa112 * code for task #74178. 2022-11-01 10:22:13 +08:00
liuhong 5c1b236833 * Adjust code #1049. 2022-10-31 09:56:23 +00:00
liuhong f9e5e9858a * Adjust code #1049 for story export. 2022-10-31 07:00:40 +00:00
王怡栋 afba980ce4 Merge branch 'bug_29103' into 'master'
* Fix bug #29103

See merge request easycorp/zentaopms!5946
2022-10-31 06:02:16 +00:00
zenggang 1af29a6aa6 * Fix bug #29103 2022-10-31 02:18:56 +00:00
liuhong 67ce1a86eb * Resolved feedback #1301. 2022-10-31 01:49:23 +00:00
liuhong 07fd9dc9aa * Fix feedback #1049. 2022-10-30 03:59:56 +00:00
孙广明 012a37a3ae Merge branch 'feedback_zhouxin_981' into 'master'
* Resolve feedback #981.

See merge request easycorp/zentaopms!5908
2022-10-27 06:21:27 +00:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
zhouxin 98bf133f47 * Resolve feedback #981. 2022-10-27 10:13:21 +08:00
caoyanyi fb5e0ec4f6 * Fix bug #28998. 2022-10-27 09:22:47 +08:00
Yagami d0abde8930 * Code for zentaopms_250 bug. 2022-10-21 17:31:32 +08:00
王怡栋 b39c666128 Merge branch 'bug_28795' into 'master'
Bug 28795

See merge request easycorp/zentaopms!5858
2022-10-21 07:59:10 +00:00
曾刚 d2771a1dea Bug 28795 2022-10-21 07:59:09 +00:00
xieqiyu 1a4bfe923e * Fix bug#26953. 2022-10-21 14:58:17 +00:00
zenggang 64e958b0f5 * Fix bug#28676 2022-10-20 05:27:28 +00:00
Yagami 33bb2e6082 * Finish task #72672. 2022-10-19 10:47:30 +08:00
lanzongjun aa6546a2ee resolve conflict 2022-10-18 09:26:14 +08:00
sunguangming c5c22f0e3d * Fix bug #28492. 2022-10-17 08:54:14 +08:00
mayue 3206407fb5 * Remove ticket from story. 2022-10-14 17:11:12 +08:00
王怡栋 900f1f42dc Merge branch 'feedback_1077' into 'master'
* Code for feedback #1077

See merge request easycorp/zentaopms!5743
2022-10-14 00:41:43 +00:00
zenggang fa83b54f4d * Code for feedback #1077 2022-10-12 08:56:08 +00:00
曹延义 4312630747 * Fix bug #28132. 2022-10-12 16:27:01 +08:00
liugang 657b36b3dc * Hide the link and unlink buttons if the execution is a none-product and single one. 2022-10-11 15:57:02 +08:00
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
liugang bc7506003f * Fix bug #28275. 2022-10-09 16:24:08 +08:00
liugang 0efa9c5f00 * Fix bug #28288. 2022-10-09 14:39:15 +08:00
liugang 4e07ba29dd * Fix bug #28168. 2022-10-09 14:25:09 +08:00
liugang 5422864456 * Fix bug #28283. 2022-10-09 13:19:54 +08:00
sunguangming 86409982fd * Fix bug #28292. 2022-10-09 13:17:40 +08:00
liugang 973583b14d * Fix bug #28277. 2022-10-09 10:01:45 +08:00
liugang 3b0a126ab0 * Fix bug #28273. 2022-10-09 09:44:47 +08:00
wangzemei ca3a61f605 * finish task 71896 2022-10-09 09:42:29 +08:00
sunguangming 22955353b1 * Fix bug #28249. 2022-10-08 10:39:06 +08:00
sunguangming d8db81e009 * Fix bug #28249. 2022-10-08 10:28:16 +08:00
xieqiyu 7b427e2eaa * Fix bug#26904. 2022-09-30 02:14:35 +00:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
wangyidong a88cc7454d Merge branch 'sprint/zentaopms240' into zentaopms_239 2022-09-30 08:49:33 +08:00
tianshujie 8e5f019f46 * Finish task #70015. 2022-09-28 11:24:47 +08:00
tianshujie c5c299b727 * Finish task #70015. 2022-09-28 09:22:13 +08:00
tianshujie 129c7dfd03 * Finish task #70015. 2022-09-28 09:15:16 +08:00
tianshujie 78905f7e05 * Finish task #70015. 2022-09-27 16:23:02 +08:00
liugang 7d5afa5d62 * Finish task #70751. 2022-09-26 17:43:09 +08:00
daitingting f7d564e837 * Finish task #70200. 2022-09-26 09:38:11 +00:00