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

cdssman-service/src/main/resources/mapper/DrugConfigMapper.xml

@@ -18,7 +18,7 @@
     </resultMap>
 
     <!-- 分页查询 -->
-    <select id="getPage" resultType="com.diagbot.entity.PacsConfig">
+    <select id="getPage" resultType="com.diagbot.entity.DrugConfig">
         select a.*
         from tran_drug_config a
         where a.is_deleted='N'