Merge branch 'feature_break'

# Conflicts:
#	ad-engine-server/src/main/resources/application-prod.yml

ad-engine-server/src/main/resources/application-prod.yml

@@ -159,4 +159,8 @@ ad:
   abtest:
     time:
       plan:
-        code:555
+        code:555
+  predict:
+    break:
+      exp:
+        code:0

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/predict/impl/PredictModelServiceImpl.java

@@ -51,7 +51,7 @@ public class PredictModelServiceImpl implements PredictModelService {
 
     @Value("${ad.predict.break.switch:false}")
     private boolean adPredictBreakSwitch;
-    @Value("${ad.predict.break.exp.code}")
+    @Value("${ad.predict.break.exp.code:0}")
     private String adPredictBreakExpCode;
 
     public Map<String, Object> adPredict(ThresholdPredictModelRequestParam requestParam) {