Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/backGoodsMapper.xml

@@ -61,16 +61,14 @@
       back_goods_back_tel, back_goods_back_logistics_company, 
       back_goods_back_logistics_no, back_goods_back_postage, 
       back_goods_back_machine_no, back_goods_desc, 
-      back_goods_state, back_goods_alipay, back_goods_is_transfer, 
-      back_goods_create_time, back_goods_update_time
+      back_goods_state, back_goods_alipay, back_goods_is_transfer
       )
     values ( #{customerId,jdbcType=INTEGER}, #{orderId,jdbcType=INTEGER},
       #{signclosedId,jdbcType=INTEGER}, #{backGoodsBackStatus,jdbcType=BIT}, #{backGoodsBackName,jdbcType=VARCHAR}, 
       #{backGoodsBackTel,jdbcType=CHAR}, #{backGoodsBackLogisticsCompany,jdbcType=VARCHAR}, 
       #{backGoodsBackLogisticsNo,jdbcType=VARCHAR}, #{backGoodsBackPostage,jdbcType=INTEGER}, 
       #{backGoodsBackMachineNo,jdbcType=VARCHAR}, #{backGoodsDesc,jdbcType=VARCHAR}, 
-      #{backGoodsState,jdbcType=BIT}, #{backGoodsAlipay,jdbcType=VARCHAR}, #{backGoodsIsTransfer,jdbcType=BIT}, 
-      #{backGoodsCreateTime,jdbcType=TIMESTAMP}, #{backGoodsUpdateTime,jdbcType=TIMESTAMP}
+      #{backGoodsState,jdbcType=BIT}, #{backGoodsAlipay,jdbcType=VARCHAR}, #{backGoodsIsTransfer,jdbcType=BIT}
       )
   </insert>
   <insert id="insertSelective" parameterType="BackGoods" >

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/complaintDetectInfoMapper.xml

@@ -126,8 +126,7 @@
         detect_failure_classification, detect_failure_cause,
         detect_results, detect_point, detect_analysis,
         detect_revolution_produced,
-        detect_desc, signclosed_create_time, signclosed_update_time,
-        machine_no,detect_is_maintenance,detect_date,maintenance_results
+        detect_desc,machine_no,detect_is_maintenance,detect_date,maintenance_results
       )
     values
       <foreach collection="list" item="node" index="index" separator="," open="" close="">
@@ -138,8 +137,7 @@
           #{node.detectFailureClassification}, #{node.detectFailureCause},
           #{node.detectResults}, #{node.detectPoint}, #{node.detectAnalysis},
           #{node.detectRevolutionProduced},
-          #{node.detectDesc}, #{node.signclosedCreateTime}, #{node.signclosedUpdateTime}
-          ,#{node.machineNo},#{node.detectIsMaintenance},#{node.detectDate},#{node.maintenanceResults}
+          #{node.detectDesc},#{node.machineNo},#{node.detectIsMaintenance},#{node.detectDate},#{node.maintenanceResults}
         )
       </foreach>
   </insert>

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/complaintSignclosedInfoMapper.xml

@@ -178,8 +178,8 @@
       signclosed_is_into, signclosed_state, signclosed_objects_state, 
       signclosed_customer_id, signclosed_urged_num, 
       old_efast_id, new_efast_id, signclosed_customer_desc, 
-      signclosed_desc, signclosed_create_time, 
-      signclosed_update_time)
+      signclosed_desc
+      )
     values (#{signclosedType,jdbcType=BIT}, #{signclosedTypeName,jdbcType=VARCHAR},
       #{machineNo,jdbcType=VARCHAR}, #{signclosedLogistics,jdbcType=VARCHAR}, #{signclosedLogisticsNumber,jdbcType=VARCHAR}, 
       #{signclosedSendName,jdbcType=VARCHAR}, #{signclosedSendTel,jdbcType=VARCHAR}, 
@@ -188,8 +188,8 @@
       #{signclosedIsInto,jdbcType=BIT}, #{signclosedState,jdbcType=BIT}, #{signclosedObjectsState,jdbcType=BIT}, 
       #{signclosedCustomerId,jdbcType=INTEGER}, #{signclosedUrgedNum,jdbcType=INTEGER}, 
       #{oldEfastId,jdbcType=VARCHAR}, #{newEfastId,jdbcType=VARCHAR}, #{signclosedCustomerDesc,jdbcType=VARCHAR}, 
-      #{signclosedDesc,jdbcType=VARCHAR}, #{signclosedCreateTime,jdbcType=TIMESTAMP}, 
-      #{signclosedUpdateTime,jdbcType=TIMESTAMP})
+      #{signclosedDesc,jdbcType=VARCHAR}
+      )
   </insert>
   <update id="updateSignclosedById" parameterType="ComplaintSignclosedInfo" >
     update tb_rst_complaint_signclosed

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/noreasonBackMapper.xml

@@ -62,16 +62,14 @@
       noreason_back_back_tel, noreason_back_back_logistics_company, 
       noreason_back_back_logistics_no, noreason_back_back_postage, 
       noreason_back_back_machine_no, noreason_back_desc, 
-      noreason_back_state, noreason_back_alipay, noreason_back_is_transfer, 
-      noreason_back_create_time, noreason_back_update_time
+      noreason_back_state, noreason_back_alipay, noreason_back_is_transfer
       )
     values ( #{customerId,jdbcType=INTEGER}, #{orderId,jdbcType=INTEGER},
       #{signclosedId,jdbcType=INTEGER}, #{noreasonBackBackStatus,jdbcType=BIT}, #{noreasonBackBackName,jdbcType=VARCHAR}, 
       #{noreasonBackBackTel,jdbcType=CHAR}, #{noreasonBackBackLogisticsCompany,jdbcType=VARCHAR}, 
       #{noreasonBackBackLogisticsNo,jdbcType=VARCHAR}, #{noreasonBackBackPostage,jdbcType=INTEGER}, 
       #{noreasonBackBackMachineNo,jdbcType=VARCHAR}, #{noreasonBackDesc,jdbcType=VARCHAR}, 
-      #{noreasonBackState,jdbcType=BIT}, #{noreasonBackAlipay,jdbcType=VARCHAR}, #{noreasonBackIsTransfer,jdbcType=BIT}, 
-      #{noreasonBackCreateTime,jdbcType=TIMESTAMP}, #{noreasonBackUpdateTime,jdbcType=TIMESTAMP}
+      #{noreasonBackState,jdbcType=BIT}, #{noreasonBackAlipay,jdbcType=VARCHAR}, #{noreasonBackIsTransfer,jdbcType=BIT}
       )
   </insert>
 

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/reissueMapper.xml

@@ -62,16 +62,14 @@
       reissue_send_name, reissue_send_tel, province_number, 
       city_number, area_number, reissue_send_merge_address, 
       reissue_send_address, reissue_send_logistics_company, 
-      reissue_send_logistics_no, reissue_desc, reissue_state, 
-      reissue_create_time, reissue_update_time
+      reissue_send_logistics_no, reissue_desc, reissue_state
       )
     values ( #{customerId,jdbcType=INTEGER}, #{orderId,jdbcType=INTEGER},
       #{reissueBackEfastOrderId,jdbcType=VARCHAR}, #{reissueSendStatus,jdbcType=BIT}, 
       #{reissueSendName,jdbcType=VARCHAR}, #{reissueSendTel,jdbcType=CHAR}, #{provinceNumber,jdbcType=VARCHAR}, 
       #{cityNumber,jdbcType=VARCHAR}, #{areaNumber,jdbcType=VARCHAR}, #{reissueSendMergeAddress,jdbcType=VARCHAR}, 
       #{reissueSendAddress,jdbcType=VARCHAR}, #{reissueSendLogisticsCompany,jdbcType=VARCHAR}, 
-      #{reissueSendLogisticsNo,jdbcType=VARCHAR}, #{reissueDesc,jdbcType=VARCHAR}, #{reissueState,jdbcType=BIT}, 
-      #{reissueCreateTime,jdbcType=TIMESTAMP}, #{reissueUpdateTime,jdbcType=TIMESTAMP}
+      #{reissueSendLogisticsNo,jdbcType=VARCHAR}, #{reissueDesc,jdbcType=VARCHAR}, #{reissueState,jdbcType=BIT}
       )
   </insert>
   <insert id="insertSelective" parameterType="Reissue" >

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/renewedMapper.xml

@@ -121,7 +121,7 @@
       renewed_send_merge_address, renewed_send_address, 
       renewed_send_logistics_company, renewed_send_logistics_no, 
       renewed_desc, renewed_state, renewed_alipay, 
-      renewed_is_transfer, renewed_create_time, renewed_update_time
+      renewed_is_transfer
       )
     values ( #{customerId,jdbcType=INTEGER}, #{orderId,jdbcType=INTEGER},
       #{signclosedId,jdbcType=INTEGER}, #{renewedBackEfastOrderId,jdbcType=VARCHAR}, 
@@ -133,7 +133,7 @@
       #{renewedSendMergeAddress,jdbcType=VARCHAR}, #{renewedSendAddress,jdbcType=VARCHAR}, 
       #{renewedSendLogisticsCompany,jdbcType=VARCHAR}, #{renewedSendLogisticsNo,jdbcType=VARCHAR}, 
       #{renewedDesc,jdbcType=VARCHAR}, #{renewedState,jdbcType=BIT}, #{renewedAlipay,jdbcType=VARCHAR}, 
-      #{renewedIsTransfer,jdbcType=BIT}, #{renewedCreateTime,jdbcType=TIMESTAMP}, #{renewedUpdateTime,jdbcType=TIMESTAMP}
+      #{renewedIsTransfer,jdbcType=BIT}
       )
   </insert>
 

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/repairMapper.xml

@@ -110,7 +110,7 @@
       area_number, repair_send_merge_address, repair_send_address, 
       repair_send_logistics_company, repair_send_logistics_no, 
       repair_desc, repair_state, repair_alipay, 
-      repair_is_transfer, repair_create_time, repair_update_time
+      repair_is_transfer
       )
     values (#{customerId,jdbcType=INTEGER}, #{orderId,jdbcType=INTEGER},
       #{signclosedId,jdbcType=INTEGER}, #{repairBackEfastOrderId,jdbcType=VARCHAR}, #{repairBackStatus,jdbcType=BIT}, 
@@ -121,7 +121,7 @@
       #{areaNumber,jdbcType=VARCHAR}, #{repairSendMergeAddress,jdbcType=VARCHAR}, #{repairSendAddress,jdbcType=VARCHAR}, 
       #{repairSendLogisticsCompany,jdbcType=VARCHAR}, #{repairSendLogisticsNo,jdbcType=VARCHAR}, 
       #{repairDesc,jdbcType=VARCHAR}, #{repairState,jdbcType=BIT}, #{repairAlipay,jdbcType=VARCHAR}, 
-      #{repairIsTransfer,jdbcType=BIT}, #{repairCreateTime,jdbcType=TIMESTAMP}, #{repairUpdateTime,jdbcType=TIMESTAMP}
+      #{repairIsTransfer,jdbcType=BIT}
       )
   </insert>
 

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/visitMapper.xml

@@ -51,12 +51,11 @@
       visit_name, visit_tel, visit_date, 
       visit_time_select, visit_status, visit_complete_date, 
       visit_complete_name, visit_complete_tel, visit_complete_remark, 
-      visit_create_time, visit_update_time, visit_complete_sex)
+      visit_complete_sex)
     values (#{visitId,jdbcType=INTEGER}, #{customerId,jdbcType=INTEGER}, #{adminId,jdbcType=INTEGER}, 
       #{visitName,jdbcType=VARCHAR}, #{visitTel,jdbcType=CHAR}, #{visitDate,jdbcType=DATE}, 
       #{visitTimeSelect,jdbcType=BIT}, #{visitStatus,jdbcType=TINYINT}, #{visitCompleteDate,jdbcType=DATE}, 
       #{visitCompleteName,jdbcType=VARCHAR}, #{visitCompleteTel,jdbcType=CHAR}, #{visitCompleteRemark,jdbcType=VARCHAR}, 
-      #{visitCreateTime,jdbcType=TIMESTAMP}, #{visitUpdateTime,jdbcType=TIMESTAMP},
       #{visitCompleteSex})
   </insert>
   <!-- 修改回访信息内容 -->

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/add_customer.ftl

@@ -669,7 +669,6 @@
             }
         })
 
-
         /*监听回访选择客服的选择事件*/
         $(document).on('change', '#visitAdminId', function() {
             var visitAdminName = $("#visitAdminId").find("option:selected").text();