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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -246,7 +246,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
             }
             //查询条件
             for (String key : packBean.getHqlPreparedMap().keySet()) {
-                query.setParameter(key,packBean.getHqlPreparedMap().get(key));
+                query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key));
             }
 
             return query.executeUpdate();
@@ -328,7 +328,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
         }
 
         for (String key : packBean.getHqlPreparedMap().keySet()) {
-            query.setParameter(key,packBean.getHqlPreparedMap().get(key));
+            query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key));
         }
 
         return query.setFirstResult(offset)