Merge branch 'mj' into dev

netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/CmsGoodsDonSkuController.java

@@ -124,6 +124,9 @@ public class CmsGoodsDonSkuController {
         if (sku.getDays() == null) {
             sku.setDays(null);
         }
+        if (sku.getMjRelaxNum() == null) {
+            sku.setMjRelaxNum(null);
+        }
         String specificGoodsIds = sku.getSpecificGoodsIds();
         if (StrUtil.isEmpty(specificGoodsIds)) {
             sku.setSpecificPrice(BigDecimal.ZERO);