Merge remote-tracking branch 'origin/master'

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

@@ -236,7 +236,10 @@ public class ShopInfo implements Serializable {
      * 税率
      */
     private String taxAmount;
-
+    /**
+     * 是否主店 1-是 0-否
+     */
+    private Integer isHeadShop;
     /**
      * 是否启用商品同步 1-是 0-否
      */
@@ -292,9 +295,5 @@ public class ShopInfo implements Serializable {
      */
     @Column(ignore = true)
     private Integer isAccountPay;
-    /**
+
-     * 是否主店 1-是 0-否
-     */
-    @Column(ignore = true)
-    private Integer isHeadShop;
 }