Merge branch 'master' of http://111.30.93.211:10101/r/supipe

叶松

2023-10-26 979c7c817b2e7d2430ac447b10f943c12dac3b64

 hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml

@@ -547,6 +547,9 @@
         sm_time as smTime
         from t_helmet_report where
        user_id=#{userId}
      <if test="strTime!=null and strTime!='' and endTime!=null and endTime!='' ">
        and sm_time between #{strTime} and #{endTime}
      </if>
        order by sm_time desc
  </select>