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

src/main/java/com/sqx/modules/pay/service/impl/PayDetailsServiceImpl.java

@@ -10,9 +10,11 @@ import com.sqx.modules.pay.dao.PayDetailsDao;
 import com.sqx.modules.pay.entity.PayDetails;
 import com.sqx.modules.pay.service.PayDetailsService;
 import com.sqx.modules.utils.TimeCompleteUtils;
+import org.apache.shardingsphere.api.hint.HintManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 

src/main/resources/mapper/pay/PayDetailsDao.xml

@@ -56,7 +56,6 @@
 		<if test="state==null or state==-1">
 			and s.state!=-1
 		</if>
-		group by s.id
 		order by s.create_time desc
 	</select>