Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java

@@ -459,6 +459,7 @@ public class OrderService {
             orderInfo.setStatus("unpaid");
             orderInfo.setOrderAmount(totalAmount);
 //            orderInfo.setOrderAmount(totalAmount.add(packAMount));
+            orderInfo.setRemark(orderVo.getRemark());
             orderInfo.setFreightAmount(feeAmount);
             orderInfo.setProductAmount(saleAmount);
             orderInfo.setTradeDay(DateUtils.getDay());

src/main/resources/mapper/TbOrderInfoMapper.xml

@@ -512,6 +512,9 @@
             <if test="masterId != null">
                 master_id = #{masterId,jdbcType=VARCHAR},
             </if>
+            <if test="remark != null and remark!=''">
+                remark = #{remark,jdbcType=VARCHAR},
+            </if>
         </set>
         where id = #{id,jdbcType=INTEGER}
     </update>