Merge branch 'dev-1.1.4' of https://172.16.32.165/hurugang/thmz_system into dev-1.1.4

src/main/java/cn/hnthyy/thmz/entity/his/zy/ZyDrug.java

@@ -21,7 +21,7 @@ public class ZyDrug {
 	/**
 	 * 帐页号
 	 */
-	private Double ledgerSn;
+	private Integer ledgerSn;
 	/**
 	 * 流水号
 	 */

src/main/java/cn/hnthyy/thmz/mapper/his/zy/ZyDrugMapper.java

@@ -15,7 +15,7 @@ public interface ZyDrugMapper {
      * @return
      */
     @Select({"<script>",
-            "SELECT charge_code     , " +
+            "SELECT charge_code=rtrim(charge_code)     , " +
             "       serial=a.serial   , " +
             "       amount=sum(a.amount)  , " +
             "       retprice=max(a.retprice), " +