Merge branch 'dev-xym-add-class' of algorithm/recommend-emr-dataprocess into feature/20250104-zt-update

src/main/scala/com/aliyun/odps/spark/examples/makedata_ad/v20240718/makedata_ad_33_bucketDataFromOriginToHive_20250228.scala

@@ -341,7 +341,9 @@ object makedata_ad_33_bucketDataFromOriginToHive_20250228 {
               if (c1.containsKey("user_has_conver_1y") && c1.getInteger("user_has_conver_1y") != null) {
                 featureMap.put("user_has_conver_1y", c1.getInteger("user_has_conver_1y"))
               }
-
+              if (c1.containsKey("user_conver_ad_class") && c1.getString("user_conver_ad_class") != null) {
+                featureMap.put("user_conver_ad_class", c1.getString("user_conver_ad_class"))
+              }
               // ui特征
               val midTimeDiff = scala.collection.mutable.Map[String, Double]()
               midActionList.foreach {

src/main/scala/com/aliyun/odps/spark/examples/makedata_ad/v20240718/makedata_ad_33_bucketDataFromOriginToHive_20250522.scala

@@ -336,6 +336,9 @@ object makedata_ad_33_bucketDataFromOriginToHive_20250522 {
               if (c1.containsKey("user_has_conver_1y") && c1.getInteger("user_has_conver_1y") != null) {
                 featureMap.put("user_has_conver_1y", c1.getInteger("user_has_conver_1y"))
               }
+              if (c1.containsKey("user_conver_ad_class") && c1.getString("user_conver_ad_class") != null) {
+                featureMap.put("user_conver_ad_class", c1.getString("user_conver_ad_class"))
+              }
 
               // ui特征
               val midTimeDiff = scala.collection.mutable.Map[String, Double]()