Merge remote-tracking branch 'origin/master'

op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml

@@ -326,7 +326,7 @@
             <if test="appendFlag != null">append_flag = #{appendFlag},</if>
             <if test="appendPercent != null">append_percent = #{appendPercent},</if>
             <if test="mtart != null and mtart != ''">mtart = #{mtart},</if>
-            <if test="reportRate != null and reportRate != ''">report_rate = #{reportRate},</if>
+            report_rate = #{reportRate},
         </trim>
         where product_id = #{productId}
     </update>