Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
44,965 Commits 2 Branches 292 Tags
ecbd0e415f4ef1de4fb475583e10bf6f595f6cc7
Commit Graph
44965 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
wangyidong ecbd0e415f * adjust for set lastExecution. 2022-09-21 11:23:44 +08:00
王怡栋 a6bed96839 Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240' 
* finish task #69255

See merge request easycorp/zentaopms!5437
 2022-09-21 02:03:52 +00:00
lanzongjun df7938e7ad * finish task #69255 2022-09-21 09:54:50 +08:00
lanzongjun c4f00619e4 * finish task #69255 2022-09-21 09:35:22 +08:00
王怡栋 c360743193 Merge branch 'sprint/zentaopms240_daitingting_optimize' into 'sprint/zentaopms240' 
* Rename noExecution to noSprint.

See merge request easycorp/zentaopms!5436
 2022-09-21 01:27:42 +00:00
wangyidong bb40a65a0a Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240 2022-09-21 09:20:45 +08:00
wangyidong 42e85921d6 * code for task #69715. 2022-09-21 09:19:47 +08:00
daitingting 8490bf7dbf * Rename noExecution to noSprint. 
* Optimize codes.
 2022-09-21 01:12:39 +00:00
王怡栋 2ba6195c41 Merge branch 'sprint/zentaopms240_Fixbug#27593' into 'sprint/zentaopms240' 
* Fix bug #27593 and bug #27592.

See merge request easycorp/zentaopms!5432
 2022-09-21 00:47:42 +00:00
lanzongjun 7bc2071cc7 Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240_lanzongjun 2022-09-21 08:40:34 +08:00
lanzongjun 7fd743aef6 * fix upgrade selectmode 2022-09-21 08:39:35 +08:00
wangyidong 8be950d693 * code for task #69707. 2022-09-21 08:25:56 +08:00
wangyuting2 5025bf7548 * Fix bug #27587. 2022-09-20 09:08:53 +00:00
wangyuting2 0b39085e99 * Fix bug #27593 and bug #27592. 2022-09-20 08:59:10 +00:00
王怡栋 47d0b6e08a Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240' 
* finish task #69706

See merge request easycorp/zentaopms!5429
 2022-09-20 08:34:01 +00:00
王怡栋 754727f371 Merge branch 'sprint/zentaopms240_task#69258' into 'sprint/zentaopms240' 
* Finish task #69258.

See merge request easycorp/zentaopms!5427
 2022-09-20 07:49:34 +00:00
王怡栋 d096a1a84b Merge branch 'sprint/zentaopms240_daitingting_69246' into 'sprint/zentaopms240' 
* Finish task #69246,#69247.

See merge request easycorp/zentaopms!5423
 2022-09-20 07:47:49 +00:00
wangyidong 1bafcc1371 Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240 2022-09-20 15:45:17 +08:00
wangyidong 64689cbd17 * code for task #69707. 2022-09-20 15:44:33 +08:00
lanzongjun 701e75324b Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240_lanzongjun 2022-09-20 15:39:47 +08:00
lanzongjun f389919243 * finish task #69706 2022-09-20 15:39:38 +08:00
lanzongjun d3cec62717 * finish task #69706 2022-09-20 15:38:00 +08:00
wangyuting2 f546d9a1a6 * Fix back button bug. 2022-09-20 07:30:13 +00:00
wangyuting2 55098e290a * Finish task #69258. 2022-09-20 07:26:13 +00:00
王 于听 a17b1a8f10 Merge branch 'sprint/zentaopms240_wangyuting' into 'sprint/zentaopms240' 
* Optimize mergeprogram css.

See merge request easycorp/zentaopms!5426
 2022-09-20 06:57:20 +00:00
wangyuting2 cea05451b1 * Add lang. 2022-09-20 06:56:09 +00:00
wangyuting2 4134b15aa5 * Optimize mergeprogram css. 2022-09-20 06:53:18 +00:00
王怡栋 e25aef80ff Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240' 
* finish task #69700#69702

See merge request easycorp/zentaopms!5420
 2022-09-20 05:25:27 +00:00
daitingting d038c1e64c * Finish task #69246,#69247. 2022-09-20 05:08:06 +00:00
lanzongjun 429a08cb1a * finish task #69700 2022-09-20 10:11:02 +08:00
王怡栋 6fa5f93776 Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240' 
modify install view and finish task #69698#69703#69704#69705#69701

See merge request easycorp/zentaopms!5416
 2022-09-20 01:15:51 +00:00
lanzongjun 6cd72e94ac * finish task #69701 2022-09-20 09:11:56 +08:00
lanzongjun 305e8cd794 * finish task #69698#69703#69704#69705 2022-09-20 08:58:41 +08:00
lanzongjun c78b1b57af modify install view 2022-09-20 08:47:58 +08:00
lanzongjun a626cb6f98 Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240_lanzongjun 2022-09-20 08:42:03 +08:00
王 于听 eb0e76c8db Merge branch 'sprint/zentaopms240_wangyuting_fixbug' into 'sprint/zentaopms240' 
* Fix default program bug.

See merge request easycorp/zentaopms!5415
 2022-09-20 00:34:36 +00:00
wangyuting2 fbde75c48b * Fix default program bug. 2022-09-20 00:28:31 +00:00
王怡栋 2bd35ee543 Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240' 
Sprint/zentaopms240 lanzongjun

See merge request easycorp/zentaopms!5408
 2022-09-19 08:45:09 +00:00
lanzongjun 5a61af92e8 Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240_lanzongjun 2022-09-19 16:19:15 +08:00
lanzongjun 9960576e69 modify mode width 2022-09-19 16:18:38 +08:00
lanzongjun 7711ea0abf modify upgrade install 2022-09-19 15:47:11 +08:00
lanzongjun 877e156ea1 modify upgrade install 2022-09-19 15:46:02 +08:00
lanzongjun 0f3c05a720 Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240_lanzongjun 2022-09-19 15:34:44 +08:00
lanzongjun 592cf557a9 modify upgrade install 2022-09-19 15:29:21 +08:00
lanzongjun e9d4597d74 modify upgrade install 2022-09-19 15:28:43 +08:00
王怡栋 75ce6bdf2f Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240' 
* finish task #69255

See merge request easycorp/zentaopms!5401
 2022-09-19 07:25:41 +00:00
lanzongjun d980ef31ba modify upgrade install 2022-09-19 15:25:06 +08:00
lanzongjun 07ad0b92f6 modify upgrade install 2022-09-19 15:21:43 +08:00
lanzongjun 322ac53e2b resolve conflict 2022-09-19 14:55:20 +08:00
lanzongjun 8f92f57390 * finish task #69255 2022-09-19 14:52:21 +08:00