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

4 years ago · f4ea4f3c8a
1 changed files with 1 additions and 1 deletions
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java
@ -21,7 +21,7 @@ public interface IcResiCollectDao extends BaseDao<IcResiCollectEntity> {
    IcResiCollectEntity selectByAddress(String address);

    int updateRec(@Param("id") String id,
-                  @Param("houseType") Integer houseType,
+                  @Param("houseType") String houseType,
                  @Param("houseHolderName") String houseHolderName,
                  @Param("totalResi") Integer totalResi);