Merge remote-tracking branch 'origin/master'

cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java

@@ -34,7 +34,7 @@ public class CzgControllerAdvice {
     public CzgResult<Object> errorHandler(Exception ex) {
         setErrorLog(ex);
         log.error("", ex);
-        return CzgResult.failure(CzgRespCode.SYSTEM_ERROR);
+        return CzgResult.failure(CzgRespCode.SYSTEM_ERROR.getCode(), ex.getMessage());
     }
 
     @ResponseBody

cash-common/cash-common-service/src/main/java/com/czg/account/entity/PrintMachine.java

@@ -66,7 +66,7 @@ public class PrintMachine implements Serializable {
     /**
      * 店铺Id
      */
-    private String shopId;
+    private Long shopId;
 
     /**
      * 分类Id