Merge remote-tracking branch 'remotes/origin/yufei' into master

gdg

2021-02-23 8b6a2a67a0bf081252648ba46fffd5591b3afc98

 src/main/java/com/nanometer/smartlab/dao/OpeOrderDao.xml

@@ -81,8 +81,19 @@
  </insert>

  <update id="updateOpeOrder" parameterType="com.nanometer.smartlab.entity.OpeOrder">
    update ope_order set order_code=#{orderCode}, order_name=#{orderName}, status=#{status}, memo=#{memo},
    consignee_user_id=#{consigneeUserId}, order_user_id=#{orderUserId}, arrival_time=#{arrivalTime}, update_time=now(),supplier_id=#{supplyId},supplier_name=#{supplyName}
    update ope_order
    <set>
      <if test="orderCode != null">order_code=#{orderCode},</if>
      <if test="orderName != null">order_name=#{orderName},</if>
      <if test="status != null">status=#{status},</if>
      <if test="memo != null">memo=#{memo},</if>
      <if test="consigneeUserId != null">consignee_user_id=#{consigneeUserId},</if>
      <if test="orderUserId != null">order_user_id=#{orderUserId},</if>
      <if test="arrivalTime != null">arrival_time=#{arrivalTime},</if>
      <if test="supplyId != null">supplier_id=#{supplyId},</if>
      <if test="supplyName != null">supplier_name=#{supplyName},</if>
      update_time=now()
    </set>
    where id=#{id}
  </update>