Commit Graph
46269 Commits
Author SHA1 Message Date
孙广明 dbef6bec02 Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256'
* task #74142

See merge request easycorp/zentaopms!5995
2022-11-02 09:10:34 +00:00
孙广明 bdec66c9c9 Merge branch 'tanghucheng_zentaopms_256' into 'zentaopms_256'
* Finish task #74149.

See merge request easycorp/zentaopms!5994
2022-11-02 09:10:14 +00:00
lanzongjun 73cf79584d * task #74142 code meeting fix 2022-11-02 17:06:37 +08:00
lanzongjun e523f6390f * task #74142 2022-11-02 16:02:42 +08:00
tanghucheng abac1771a4 * Finish task #74149. 2022-11-02 16:00:16 +08:00
xieqiyu 7ac890f382 * Fix bug#29180. 2022-11-02 07:36:30 +00:00
唐胡成 421d30ad23 Merge branch 'tanghucheng_zentaopms_256' into 'zentaopms_256'
* Fix bug #29177,29172.

See merge request easycorp/zentaopms!5989
2022-11-02 07:26:34 +00:00
tanghucheng fa92ed247f * Fix bug #29177,29172. 2022-11-02 15:24:43 +08:00
xieqiyu 4c99401fe5 * Code for task#74144,#74155. 2022-11-02 06:58:20 +00:00
lanzongjun f980579b0a * task #74142 2022-11-02 14:42:20 +08:00
tanghucheng 3821cc3e53 * Code for sibling story. 2022-11-02 13:12:19 +08:00
孙广明 6d0b8a3917 Merge branch 'tanghucheng_zentaopms_256' into 'zentaopms_256'
* Fix code format.

See merge request easycorp/zentaopms!5979
2022-11-02 02:59:16 +00:00
tanghucheng 06ed61a897 * Fix code format. 2022-11-02 10:56:38 +08:00
xieqiyu 630e031d59 * Add set stage of story for sync siblings. 2022-11-02 01:49:45 +00:00
xieqiyu a8fc2c5aaa * Adjust style. 2022-11-02 01:26:17 +00:00
孙广明 c13a38a8fb Merge branch 'tanghucheng_zentaopms_256' into 'zentaopms_256'
* Add group.

See merge request easycorp/zentaopms!5971
2022-11-02 00:27:42 +00:00
xieqiyu 3c57bdc787 * Adjust style. 2022-11-01 09:22:44 +00:00
xieqiyu f54e8546fa * Code for task#74154,#74153. 2022-11-01 09:17:00 +00:00
xieqiyu e80da381ba * Finish task#74154,#74153. 2022-11-01 08:06:45 +00:00
lanzongjun 5f4df78b5a * task #74142 2022-11-01 16:06:24 +08:00
xieqiyu d97b9f29d1 * Modify action name. 2022-11-01 07:51:06 +00:00
xieqiyu 0a9a801389 * Code for task#74152. 2022-11-01 07:48:34 +00:00
tanghucheng e403ddec67 * Add group. 2022-11-01 15:16:09 +08:00
孙广明 30b0b51e02 Merge branch 'tanghucheng_zentaopms_256' into 'zentaopms_256'
* Finish task #74148.

See merge request easycorp/zentaopms!5966
2022-11-01 06:47:09 +00:00
tanghucheng 3d14d475ce * Finish task #74148. 2022-11-01 13:51:56 +08:00
孙广明 dccfd7afd0 Merge branch 'tanghucheng_zentaopms_256' into 'zentaopms_256'
* Finish task #74143.

See merge request easycorp/zentaopms!5963
2022-11-01 05:32:44 +00:00
tanghucheng 35b7acb4f6 * Add language. 2022-11-01 13:26:56 +08:00
lanzongjun 67737d25c2 * task #74142 2022-11-01 09:58:04 +08:00
xieqiyu 3588dd89e6 * Modify the variable name. 2022-11-01 00:59:40 +00:00
xieqiyu 1327b611b2 * Modify code review issues. 2022-11-01 00:45:02 +00:00
tanghucheng cdc9bdcf2d * Code for task#74145. 2022-10-31 17:23:33 +08:00
lanzongjun 22f0fce8d0 * task #74142 2022-10-31 17:23:23 +08:00
lanzongjun 9cfd8f0f8e * task #74142 2022-10-31 16:29:21 +08:00
xieqiyu bb390ecd9c * Code for task#74146. Add judgment conditions. 2022-10-31 07:56:49 +00:00
xieqiyu cd51b97feb * Code for task#74146. 2022-10-31 07:46:52 +00:00
xieqiyu 5a2bccfb7c * Code for task#74146. 2022-10-31 07:39:30 +00:00
孙广明 fc2784df82 Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256'
* finish task #74147

See merge request easycorp/zentaopms!5947
2022-10-31 06:27:08 +00:00
lanzongjun 5b8f882608 * finish task #74147 2022-10-31 11:13:26 +08:00
xieqiyu b2b0beab35 * Add sibling field for story table. 2022-10-31 03:01:53 +00:00
李玉春 0d7e25c83d Merge branch 'sprint/253_tianshujie_fixbug' into 'master'
Sprint/253 tianshujie fixbug

See merge request easycorp/zentaopms!5938
2022-10-28 09:11:40 +00:00
朱金勇 9a301cff93 Merge branch 'sprint/fix-checkPriv' into 'master'
* Fix bug of unauthorized users.

See merge request easycorp/zentaopms!5932
2022-10-28 08:16:51 +00:00
鲁飞 b1cb5a798e * Fix bug of unauthorized users. 2022-10-28 08:16:50 +00:00
tianshujie 2bf41732ef * Fix bug #29000. 2022-10-28 16:08:40 +08:00
tianshujie 5fdc7eff1a Modify the maintenance task team action button style. 2022-10-28 16:05:22 +08:00
tianshujie 278c4779f6 * Modify the list of issues in the block to be processed. 2022-10-28 15:59:17 +08:00
孙广明 8389191e25 Merge branch 'sprint/253_tianshujie_73746' into 'master'
* Fix bug #29035.

See merge request easycorp/zentaopms!5934
2022-10-28 07:39:11 +00:00
tianshujie fb546c1176 * Fix bug #29035. 2022-10-28 15:17:08 +08:00
王怡栋 f03d771f33 Merge branch 'master_bug_28882' into 'master'
* Fix bug #28882.

See merge request easycorp/zentaopms!5929
2022-10-28 03:28:35 +00:00
王怡栋 85d92fa65b Merge branch 'master_bug_28884' into 'master'
* Fix bug #28884.

See merge request easycorp/zentaopms!5928
2022-10-28 03:28:05 +00:00
王怡栋 af1c82ddb1 Merge branch 'master_bug_28949' into 'master'
*Fix bug #28949.

See merge request easycorp/zentaopms!5925
2022-10-28 03:27:38 +00:00