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

# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java
#	src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
#	src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
#	src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
#	src/main/resources/mapper/TbProductMapper.xml

src/main/resources/mapper/TbActivateInRecordMapper.xml

@@ -111,7 +111,7 @@
                                           over_num, shop_id, source_act_id, source_flow_id, use_start_time,
                                           use_end_time, create_time, update_time, coupon_json, source)
         values (#{vipUserId}, #{couponId}, #{name}, #{type}, #{proId}, #{fullAmount}, #{discountAmount}, #{num},
-                #{overNum}, #{shopId}, #{sourceActId}, #{sourceFlowId}, #{useStartTime}, #{useEndTime}, #{createTime},
+                #{overNum}, #{shopId}, #{sourceActId}, #{sourceFlowId}, #{useStartTime}, #{useEndTime}, now(),
                 #{updateTime}, #{couponJson}, #{source})
     </insert>
 
@@ -124,7 +124,7 @@
             (#{entity.vipUserId}, #{entity.couponId}, #{entity.name}, #{entity.type}, #{entity.proId},
             #{entity.fullAmount}, #{entity.discountAmount}, #{entity.num}, #{entity.overNum}, #{entity.shopId},
             #{entity.sourceActId}, #{entity.sourceFlowId}, #{entity.useStartTime}, #{entity.useEndTime},
-            #{entity.createTime}, #{entity.updateTime}, #{entity.couponJson},#{entity.source})
+            now(), #{entity.updateTime}, #{entity.couponJson},#{entity.source})
         </foreach>
     </insert>