Merge branch 'dev_user_grid_work_2_jinan' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

epmet-user/epmet-user-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml

@@ -33,7 +33,7 @@
         WHERE
         m.CUSTOMER_ID = #{customerId}
         <if test="id != null and id != ''">
-            AND ID = #{id}
+            AND m.ID = #{id}
         </if>
         AND m.DEL_FLAG = '0'
     </select>