Merge branch 'score_shop' into api_score_meger

jyy

2021-07-17 274fceda8d8ae15eead0fc6490f4d1680d9ab3c5

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/ServiceRecordServiceImpl.java

@@ -26,7 +26,7 @@
   @Override
   public int add(ServiceRecord serviceRecord){
//      Date now=new Date();
//      if(DateUtils.isAffterDate( serviceRecord.getCreateTime(),now)){
//      if(DateUtil.isAffterDate( serviceRecord.getCreateTime(),now)){
//         throw new GlobleException("跟进时间必须大于当前时间");
//      }