Merge branch 'cc_20250526_jingDong' into 'master'
Cc 20250526 jing dong See merge request hangzhou/java/custom_zxjp!102
This commit is contained in:
@@ -132,6 +132,7 @@ public enum ShopSubStageEnum {
|
||||
case SHOP_STAGE_22:
|
||||
case SHOP_STAGE_23:
|
||||
case SHOP_STAGE_24:
|
||||
case SHOP_STAGE_25:
|
||||
return ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00;
|
||||
default:
|
||||
return null;
|
||||
@@ -150,6 +151,7 @@ public enum ShopSubStageEnum {
|
||||
case SHOP_STAGE_20:
|
||||
case SHOP_STAGE_21:
|
||||
case SHOP_STAGE_22:
|
||||
case SHOP_STAGE_25:
|
||||
return null;
|
||||
default:
|
||||
return planCompleteTime.plusDays(getPlanCompleteDays()).toString();
|
||||
|
||||
Reference in New Issue
Block a user