Commit Graph
29176 Commits
Author SHA1 Message Date
tianshujie 3d09288eca * Modify the code. 2021-11-19 15:33:19 +08:00
tianshujie db6be58c1a * Modify batch create bug page. 2021-11-19 13:12:47 +08:00
tianshujie 256c76c0b8 * Modify code logic. 2021-11-19 11:40:58 +08:00
tianshujie 53a34f1546 * Modify the code. 2021-11-19 11:27:36 +08:00
tianshujie 3045b1a234 * Fix the scope of the products listed in the edit case. 2021-11-19 10:54:18 +08:00
tianshujie f033e37924 * Modify the product range of a single creation use case. 2021-11-19 09:32:00 +08:00
tianshujie 70f8e0d320 * Fix execution and project linked product prompt issues. 2021-11-19 08:44:53 +08:00
李玉春 40b0b05a3e Merge branch 'sprint/170_mayue_16407' into 'sprint/170'
* Fix bug #16407.

See merge request easycorp/zentaopms!525
2021-11-18 09:33:43 +00:00
李玉春 dc8dc55534 Merge branch 'sprint/170_mayue_16406' into 'sprint/170'
* Fix bug #16406.

See merge request easycorp/zentaopms!528
2021-11-18 09:29:29 +00:00
mayue 1d9fc9d476 * Fix bug #16407. 2021-11-18 17:26:27 +08:00
李玉春 8a1ab522bd Merge branch 'sprint/173_wangjianhua_44491' into 'sprint/170'
Finish task 44491. Load branch lang before using.

See merge request easycorp/zentaopms!532
2021-11-18 09:24:07 +00:00
mayue bff4aebfd4 * Fix bug #16406. 2021-11-18 17:24:00 +08:00
李玉春 ba8ec26e96 Merge branch 'sprint/170_zhouxin_44486,44487,44488' into 'sprint/170'
Add realBegan for program.

See merge request easycorp/zentaopms!529
2021-11-18 09:21:25 +00:00
李玉春 7c9add376d Merge branch 'sprint/170_songchenxuan_16376' into 'sprint/170'
Sprint/170 songchenxuan 16376

See merge request easycorp/zentaopms!530
2021-11-18 09:20:35 +00:00
李玉春 36e39591be Merge branch 'sprint/173_wangjianhua_44503' into 'sprint/170'
* finish task 44503

See merge request easycorp/zentaopms!516
2021-11-18 09:19:19 +00:00
wangjianhua 1e57264ff4 * finish task 44491. Load branch lang before using. 2021-11-18 09:16:07 +00:00
songchenxuan f92a67b62a * Fix bug 16376 2021-11-18 17:09:42 +08:00
songchenxuan 1f9f382aa0 * Fix bug 16376 2021-11-18 17:06:44 +08:00
wangjianhua e011da6fd2 - Finish task 44503. Remove usless variable. 2021-11-18 09:02:45 +00:00
孙广明 640eb3a48b Merge branch 'sprint/170_tianshujie_16429' into 'sprint/170'
* Fix bug #16429.

See merge request easycorp/zentaopms!527
2021-11-18 08:57:25 +00:00
zhouxin 88938892b0 Add realBegan for program. 2021-11-18 16:49:11 +08:00
李玉春 936f56e325 Merge branch 'sprint/173_wangjianhua_44491' into 'sprint/170'
* finish task 44491

See merge request easycorp/zentaopms!505
2021-11-18 08:47:29 +00:00
马跃 8b7f409645 Update control.php 2021-11-18 08:45:20 +00:00
mayue 3a48a57047 * Fix bug #16406. 2021-11-18 16:42:27 +08:00
tianshujie 9c6c4dfc9c * Fix bug #16429. 2021-11-18 16:30:45 +08:00
mayue d03b905ffd * Fix bug #16407. 2021-11-18 16:30:07 +08:00
mayue 940e79bf1f * Fix bug #16406. 2021-11-18 16:08:28 +08:00
mayue 8bf4523777 * Fix bug #16407. 2021-11-18 16:03:19 +08:00
李玉春 644abad1fb Merge branch 'sprint/170_tianshujie_16431' into 'sprint/170'
* Fix bug #16431.

See merge request easycorp/zentaopms!523
2021-11-18 07:37:37 +00:00
tianshujie 662a1960f5 * Fix bug #16431. 2021-11-18 15:35:54 +08:00
李玉春 3f52d7ce47 Merge branch 'sprint/170_mayue_code_error' into 'sprint/170'
* Fix code error.

See merge request easycorp/zentaopms!520
2021-11-18 07:26:45 +00:00
mayue 039784e212 * Fix code error. 2021-11-18 15:24:15 +08:00
李玉春 af6d5e4ca0 Merge branch 'sprint/170_tianshujie_16396' into 'sprint/170'
* Fix bug #16396.

See merge request easycorp/zentaopms!518
2021-11-18 07:13:15 +00:00
tianshujie eac30e4699 * Modify code. 2021-11-18 15:12:38 +08:00
liyuchun 8fa3ad39c1 Merge branch 'sprint/170_mayue_16364' into sprint/170 2021-11-18 15:09:52 +08:00
李玉春 bf47fb620b Merge branch 'sprint/170' into 'sprint/170_mayue_16364'
# Conflicts:
#   module/project/control.php
2021-11-18 07:09:28 +00:00
tianshujie 0a03aea29a * Fix bug #16396. 2021-11-18 15:07:51 +08:00
mayue c26fb97685 * Fix bug #16364. 2021-11-18 15:07:42 +08:00
李玉春 12b6f58053 Merge branch 'sprint/170_songchenxuan_16377' into 'sprint/170'
Sprint/170 songchenxuan 16377

See merge request easycorp/zentaopms!514
2021-11-18 07:06:26 +00:00
songchenxuan 073deec215 * Fix bug 16377 2021-11-18 15:05:56 +08:00
李玉春 c4e9dc5a4e Merge branch 'sprint/170_zhengrunyu_BUG_16378' into 'sprint/170'
*Finish task #16378.

See merge request easycorp/zentaopms!512
2021-11-18 07:03:43 +00:00
孙广明 6085ad3089 Merge branch 'sprint/170_tianshujie_44496' into 'sprint/170'
*Finish task #44496

See merge request easycorp/zentaopms!511
2021-11-18 06:59:45 +00:00
songchenxuan 504e284d63 * Fix bug 16377. 2021-11-18 14:48:41 +08:00
tianshujie 22fdf1f0fc * Modify code. 2021-11-18 14:48:21 +08:00
mayue 49b3b22630 * Fix bug #16364. 2021-11-18 14:48:05 +08:00
李玉春 d8993bf4d5 Merge branch 'sprint/170_songchenxuan_codefortest-bug' into 'sprint/170'
* Code for test-bug.

See merge request easycorp/zentaopms!510
2021-11-18 06:42:46 +00:00
zhujinyong a796848a49 Merge branch 'sprint/170' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170 2021-11-18 14:35:50 +08:00
zhujinyong 6175d59ce3 * Compatiblity for ubb. 2021-11-18 14:35:21 +08:00
李玉春 15967171de Merge branch 'sprint/173_lizhiqiang_16371' into 'sprint/170'
Fix bug#16371.

See merge request easycorp/zentaopms!513
2021-11-18 06:33:49 +00:00
李玉春 3870f6f9e4 Merge branch 'sprint/170_zhouxin_44486,44487,44488' into 'sprint/170'
Finis task #44486,44487,44488.

See merge request easycorp/zentaopms!495
2021-11-18 06:30:03 +00:00