Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java

ms-dal/src/main/resources/mapper/MoveShopSettingMapper.xml

@@ -216,7 +216,7 @@
         is_config_default,mobile,delivery_delay_day,
         freight_template_id,supply_7day_return,reduce_type,
         move_onsale_type,price_percent,price_add,
-        price_sub,price_tail,price_decimal,
+        price_sub,price_tail,price_decimal,price_decimal_type_redio,price_decimal_type
         price_decimal_diy_value,is_price_add_post_fee,base_price_type,
         price_mode,ali_price_type,no_consign_price_type,
         sku_min_price_status,sku_min_price_type,add_sku_min_price_type,
@@ -306,7 +306,7 @@
         ,is_config_default,mobile,delivery_delay_day
         ,freight_template_id,supply_7day_return,reduce_type
         ,move_onsale_type,price_percent,price_add
-        ,price_sub,price_tail,price_decimal
+        ,price_sub,price_tail,price_decimal,price_decimal_type_redio,price_decimal_type
         ,price_decimal_diy_value,is_price_add_post_fee,base_price_type
         ,price_mode,ali_price_type,no_consign_price_type
         ,sku_min_price_status,sku_min_price_type,add_sku_min_price_type