Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-24 7a52cd14e12e5b1053a26ed5a4799da7a09d4b16

 src/main/java/com/moral/mapper/DemoMapper.java

@@ -4,5 +4,5 @@
import java.util.Map;

public interface DemoMapper {
   List<Map<String, Object>> getDatas();
   List<Map<String, Object>> getDatas(Map<String, Object> parameters);
}