Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookDishes.java

@@ -380,7 +380,8 @@ public class CookDishes extends BaseEntity {
     private BigDecimal phosphorus;
     private BigDecimal selenium;
     private String salesNum;
-
+    @ApiModelProperty(value = "胡萝卜素(μg/100g)")
+    private BigDecimal carotene;
 
 
 

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookDishesMapper.xml

@@ -90,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="phosphorus" column="phosphorus"/>
         <result property="selenium" column="selenium"/>
         <result property="salesNum" column="sales_num"/>
+        <result property="carotene" column="carotene"/>
 
     </resultMap>
 
@@ -131,7 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                vitamin_e, magnesium, zinc, glycemic_index, sort, cd.canteen_id,bc.canteen_name,cd.shopstall_id,bs.stall_name, hide_flag, convert_flag, material_cost,
                gross_profit, gross_profit_rate, public_dishes, cd.area_id,ba.area_name, meal_id, cd.create_by, cd.create_time, cd.update_by, cd.update_time,
                 cd.processing_method, cd.processing_time, cd.edible, cd.water, cd.ash, cd.retinol, cd.thiamine, cd.riboflavin, cd.niacin, vitamin_d,
-                cd.phosphorus, cd.selenium
+                cd.phosphorus, cd.selenium,cd.carotene
         from cook_dishes cd
         left join basic_area ba on cd.area_id = ba.area_id
         left join basic_canteen bc on cd.canteen_id = bc.canteen_id
@@ -375,6 +376,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="vitaminD != null">vitamin_d,</if>
             <if test="phosphorus != null">phosphorus,</if>
             <if test="selenium != null">selenium,</if>
+            <if test="carotene != null">carotene,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="mealType != null">#{mealType},</if>
@@ -457,6 +459,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="vitaminD != null">#{vitaminD},</if>
             <if test="phosphorus != null">#{phosphorus},</if>
             <if test="selenium != null">#{selenium},</if>
+            <if test="carotene != null">#{carotene},</if>
          </trim>
     </insert>
 
@@ -551,6 +554,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="vitaminD != null">vitamin_d = #{vitaminD},</if>
             <if test="phosphorus != null">phosphorus = #{phosphorus},</if>
             <if test="selenium != null">selenium = #{selenium},</if>
+            <if test="carotene != null">carotene = #{carotene},</if>
         </trim>
         where dishes_id = #{dishesId}
     </update>
@@ -588,6 +592,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bean.vitaminD != null">vitamin_d = #{bean.vitaminD},</if>
             <if test="bean.processingMethod != null">processing_method = #{bean.processingMethod},</if>
             <if test="bean.processingTime != null">processing_time = #{bean.processingTime},</if>
+            <if test="bean.carotene != null">carotene = #{bean.carotene},</if>
         </trim>
         where dishes_id = #{dishesId}
     </update>