Merge branch 'dev' of http://172.16.90.250:3000/cqcarbon/carbon-platform into dev

 Conflicts:

	carbon-h5/carbon-h5-service/src/main/resources/com/hcloud/microserver/h5/dao/CustomerInfoMapper.xml

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CarbonPlatformStatiticsNum.java

@@ -1,56 +0,0 @@
-package com.hcloud.microserver.facade.carbon.entity;
-
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-@Data
-@ApiModel(value = "碳汇平台统计",description = "碳汇平台的用户量统计")
-public class CarbonPlatformStatiticsNum {
-    @ApiModelProperty("企业总数")
-    private BigDecimal compNum;
-
-    @ApiModelProperty("用户总数")
-    private BigDecimal customerNum;
-
-    @ApiModelProperty("企业用户占总用户的占比")
-    private BigDecimal compCustomerPercentage;
-
-    @ApiModelProperty("不是企业用户占总用户的占比")
-    private BigDecimal NoCompCustomerPercentage;
-
-    @ApiModelProperty("平台用户访问量")
-    private BigDecimal views;
-
-    @ApiModelProperty("产品总量")
-    private BigDecimal productNum;
-
-    @ApiModelProperty("产品各类别占量")
-    private List<CarbonStatisticsProduct> productList;
-
-    @ApiModelProperty("交易订单量")
-    private BigDecimal orderNum;
-
-
-    @ApiModelProperty("农户数量")
-    private BigDecimal farmerTotalNum;
-
-    @ApiModelProperty("集体数量")
-    private BigDecimal collectiveTotalNum;
-
-    @ApiModelProperty("各集体农户占比")
-    private List<CarbonStatisticsFarmer> farmerList;
-
-    @ApiModelProperty("总销售量")
-    private BigDecimal carbonTotalBuy;
-
-
-
-
-
-
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CarbonStatisticsBuyTrend.java

@@ -1,34 +0,0 @@
-package com.hcloud.microserver.facade.carbon.entity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@ApiModel(value = "CarbonStatisticsBuyTrend",description = "统计购买趋势")
-@Data
-public class CarbonStatisticsBuyTrend {
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("碳汇量")
-    private BigDecimal carbonAmount;
-
-    @ApiModelProperty("最小碳汇量")
-    private BigDecimal minCarbonAmount;
-
-    @ApiModelProperty("最大碳汇量")
-    private BigDecimal maxCarbonAmount;
-
-    @ApiModelProperty("总价格")
-    private BigDecimal totalMoney;
-
-    @ApiModelProperty("最小价格")
-    private BigDecimal minMoney;
-
-    @ApiModelProperty("最大价格")
-    private BigDecimal maxMoney;
-
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CarbonStatisticsProduct.java

@@ -1,20 +0,0 @@
-package com.hcloud.microserver.facade.carbon.entity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-@Data
-@ApiModel(value = "CarbonStatisticsProduct",description = "产品类别统计")
-public class CarbonStatisticsProduct {
-
-    @ApiModelProperty("类别名称")
-    private String productTypeName;
-    @ApiModelProperty("数量")
-    private BigDecimal num;
-
-    @ApiModelProperty("占比")
-    private BigDecimal ratio;
-
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CollectiveProductBelong.java

@@ -1,20 +0,0 @@
-package com.hcloud.microserver.facade.carbon.entity;
-
-import lombok.ToString;
-
-import java.io.Serializable;
-
-@ToString
-public class CollectiveProductBelong extends ProductBelong implements Serializable {
-
-    private static final long serialVersionUID = 4861049796598851983L;
-    private CollectiveFarmer collectiveFarmer;
-
-    public CollectiveFarmer getCollectiveFarmer() {
-        return collectiveFarmer;
-    }
-
-    public void setCollectiveFarmer(CollectiveFarmer collectiveFarmer) {
-        this.collectiveFarmer = collectiveFarmer;
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CustomerCompanyInfo.java

@@ -1,134 +0,0 @@
-package com.hcloud.microserver.facade.carbon.entity;
-
-import lombok.ToString;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author xiezt
- */
-@ToString
-public class CustomerCompanyInfo implements Serializable {
-    private static final long serialVersionUID = -8242664522405565533L;
-
-    private String guid;
-
-    private String fkCustomerId;
-
-    private String companyName;
-
-    private String orgCode;
-
-    private String principals;
-
-    private String phone;
-
-    private String email;
-
-    private String companyAddress;
-
-    private String companyImages;
-
-    private Integer state;
-
-    private Date createTime;
-
-    private Date modifiedTime;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getFkCustomerId() {
-        return fkCustomerId;
-    }
-
-    public void setFkCustomerId(String fkCustomerId) {
-        this.fkCustomerId = fkCustomerId == null ? null : fkCustomerId.trim();
-    }
-
-    public String getCompanyName() {
-        return companyName;
-    }
-
-    public void setCompanyName(String companyName) {
-        this.companyName = companyName == null ? null : companyName.trim();
-    }
-
-    public String getOrgCode() {
-        return orgCode;
-    }
-
-    public void setOrgCode(String orgCode) {
-        this.orgCode = orgCode == null ? null : orgCode.trim();
-    }
-
-    public String getPrincipals() {
-        return principals;
-    }
-
-    public void setPrincipals(String principals) {
-        this.principals = principals == null ? null : principals.trim();
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone == null ? null : phone.trim();
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email == null ? null : email.trim();
-    }
-
-    public String getCompanyAddress() {
-        return companyAddress;
-    }
-
-    public void setCompanyAddress(String companyAddress) {
-        this.companyAddress = companyAddress == null ? null : companyAddress.trim();
-    }
-
-    public String getCompanyImages() {
-        return companyImages;
-    }
-
-    public void setCompanyImages(String companyImages) {
-        this.companyImages = companyImages == null ? null : companyImages.trim();
-    }
-
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getModifiedTime() {
-        return modifiedTime;
-    }
-
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/DayCarbonBO.java

@@ -1,17 +0,0 @@
-package com.hcloud.microserver.facade.carbon.entity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-@ApiModel
-public class DayCarbonBO implements Serializable {
-    @ApiModelProperty("碳汇量")
-    private long carbonNum;
-
-    @ApiModelProperty("订单数量")
-    private long orderNum;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/FarmerInfo.java

@@ -1,282 +0,0 @@
-package com.hcloud.microserver.facade.carbon.entity;
-
-import lombok.ToString;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-@ToString
-public class FarmerInfo implements Serializable {
-
-    private static final long serialVersionUID = 764011447211904341L;
-    private String guid;
-
-    private String fkPovertyAreaId;
-
-    private String fkCollectiveId;
-
-    private String farmerCode;
-
-    private String farmerName;
-
-    private Integer familyNum;
-
-    private Integer sex;
-
-    private String pid;
-
-    private String nation;
-
-    private String education;
-
-    private String phone;
-
-    private String bankCardNo;
-
-    private BigDecimal incomeVal;
-
-    private String farmerType;
-
-    private String farmerRemark;
-
-    private String farmerImages;
-
-    private String villageOrg;
-
-    private Integer isEnable;
-
-    private Integer state;
-
-    private String createUser;
-
-    private Date createTime;
-
-    private String modifiedUser;
-
-    private Date modifiedTime;
-
-    private String bankClearingMsg;
-
-    private BigDecimal recieveMoney;
-
-    private BigDecimal actualMoney;
-
-    private PovertyArea povertyArea;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getFkPovertyAreaId() {
-        return fkPovertyAreaId;
-    }
-
-    public void setFkPovertyAreaId(String fkPovertyAreaId) {
-        this.fkPovertyAreaId = fkPovertyAreaId == null ? null : fkPovertyAreaId.trim();
-    }
-
-    public String getFkCollectiveId() {
-        return fkCollectiveId;
-    }
-
-    public void setFkCollectiveId(String fkCollectiveId) {
-        this.fkCollectiveId = fkCollectiveId == null ? null : fkCollectiveId.trim();
-    }
-
-    public String getFarmerCode() {
-        return farmerCode;
-    }
-
-    public void setFarmerCode(String farmerCode) {
-        this.farmerCode = farmerCode == null ? null : farmerCode.trim();
-    }
-
-    public String getFarmerName() {
-        return farmerName;
-    }
-
-    public void setFarmerName(String farmerName) {
-        this.farmerName = farmerName == null ? null : farmerName.trim();
-    }
-
-    public Integer getFamilyNum() {
-        return familyNum;
-    }
-
-    public void setFamilyNum(Integer familyNum) {
-        this.familyNum = familyNum;
-    }
-
-    public Integer getSex() {
-        return sex;
-    }
-
-    public void setSex(Integer sex) {
-        this.sex = sex;
-    }
-
-    public String getPid() {
-        return pid;
-    }
-
-    public void setPid(String pid) {
-        this.pid = pid == null ? null : pid.trim();
-    }
-
-    public String getNation() {
-        return nation;
-    }
-
-    public void setNation(String nation) {
-        this.nation = nation == null ? null : nation.trim();
-    }
-
-    public String getEducation() {
-        return education;
-    }
-
-    public void setEducation(String education) {
-        this.education = education == null ? null : education.trim();
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone == null ? null : phone.trim();
-    }
-
-    public String getBankCardNo() {
-        return bankCardNo;
-    }
-
-    public void setBankCardNo(String bankCardNo) {
-        this.bankCardNo = bankCardNo == null ? null : bankCardNo.trim();
-    }
-
-    public BigDecimal getIncomeVal() {
-        return incomeVal;
-    }
-
-    public void setIncomeVal(BigDecimal incomeVal) {
-        this.incomeVal = incomeVal;
-    }
-
-    public String getFarmerType() {
-        return farmerType;
-    }
-
-    public void setFarmerType(String farmerType) {
-        this.farmerType = farmerType == null ? null : farmerType.trim();
-    }
-
-    public String getFarmerRemark() {
-        return farmerRemark;
-    }
-
-    public void setFarmerRemark(String farmerRemark) {
-        this.farmerRemark = farmerRemark == null ? null : farmerRemark.trim();
-    }
-
-    public String getFarmerImages() {
-        return farmerImages;
-    }
-
-    public void setFarmerImages(String farmerImages) {
-        this.farmerImages = farmerImages == null ? null : farmerImages.trim();
-    }
-
-    public String getVillageOrg() {
-        return villageOrg;
-    }
-
-    public void setVillageOrg(String villageOrg) {
-        this.villageOrg = villageOrg == null ? null : villageOrg.trim();
-    }
-
-    public Integer getIsEnable() {
-        return isEnable;
-    }
-
-    public void setIsEnable(Integer isEnable) {
-        this.isEnable = isEnable;
-    }
-
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public String getCreateUser() {
-        return createUser;
-    }
-
-    public void setCreateUser(String createUser) {
-        this.createUser = createUser == null ? null : createUser.trim();
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getModifiedUser() {
-        return modifiedUser;
-    }
-
-    public void setModifiedUser(String modifiedUser) {
-        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
-    }
-
-    public Date getModifiedTime() {
-        return modifiedTime;
-    }
-
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-
-    public String getBankClearingMsg() {
-        return bankClearingMsg;
-    }
-
-    public void setBankClearingMsg(String bankClearingMsg) {
-        this.bankClearingMsg = bankClearingMsg == null ? null : bankClearingMsg.trim();
-    }
-
-    public BigDecimal getRecieveMoney() {
-        return recieveMoney;
-    }
-
-    public void setRecieveMoney(BigDecimal recieveMoney) {
-        this.recieveMoney = recieveMoney;
-    }
-
-    public BigDecimal getActualMoney() {
-        return actualMoney;
-    }
-
-    public void setActualMoney(BigDecimal actualMoney) {
-        this.actualMoney = actualMoney;
-    }
-
-    public PovertyArea getPovertyArea() {
-        return povertyArea;
-    }
-
-    public void setPovertyArea(PovertyArea povertyArea) {
-        this.povertyArea = povertyArea;
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsInfo.java

@@ -1,227 +0,0 @@
-package com.hcloud.microserver.facade.carbon.entity;
-
-import lombok.ToString;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author JYJ
- */
-@ToString
-public class GoodsInfo implements Serializable {
-
-    private static final long serialVersionUID = -2833811165241905425L;
-
-    private String guid;
-
-    private String goodsType;
-
-    private String goodsCode;
-
-    private String goodsName;
-
-    private BigDecimal carbonVal;
-
-    private BigDecimal price;
-
-    private String goodsDesc;
-
-    private String goodsImages;
-
-    private Date goodsSaleDate;
-
-    private Integer isSale;
-
-    private Integer state;
-
-    private String createUser;
-
-    private Date createTime;
-
-    private String modifiedUser;
-
-    private Date modifiedTime;
-
-    private String goodsUse;
-
-    // 非t_goods_info表字段,需要join其他表用于显示的字段
-    private String productTypeName;
-
-    private BigDecimal saledCarbonSkin;
-
-    private BigDecimal unsaledCarbonSkin;
-
-    private String saleTargets;
-
-    private String saleType;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getGoodsType() {
-        return goodsType;
-    }
-
-    public void setGoodsType(String goodsType) {
-        this.goodsType = goodsType==null?null:goodsType.trim();
-    }
-
-    public String getGoodsCode() {
-        return goodsCode;
-    }
-
-    public void setGoodsCode(String goodsCode) {
-        this.goodsCode = goodsCode == null ? null : goodsCode.trim();
-    }
-
-    public String getGoodsName() {
-        return goodsName;
-    }
-
-    public void setGoodsName(String goodsName) {
-        this.goodsName = goodsName == null ? null : goodsName.trim();
-    }
-
-    public BigDecimal getCarbonVal() {
-        return carbonVal;
-    }
-
-    public void setCarbonVal(BigDecimal carbonVal) {
-        this.carbonVal = carbonVal;
-    }
-
-    public BigDecimal getPrice() {
-        return price;
-    }
-
-    public void setPrice(BigDecimal price) {
-        this.price = price;
-    }
-
-    public String getGoodsDesc() {
-        return goodsDesc;
-    }
-
-    public void setGoodsDesc(String goodsDesc) {
-        this.goodsDesc = goodsDesc == null ? null : goodsDesc.trim();
-    }
-
-    public String getGoodsImages() {
-        return goodsImages;
-    }
-
-    public void setGoodsImages(String goodsImages) {
-        this.goodsImages = goodsImages == null ? null : goodsImages.trim();
-    }
-
-    public Integer getIsSale() {
-        return isSale;
-    }
-
-    public void setIsSale(Integer isSale) {
-        this.isSale = isSale;
-    }
-
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public String getCreateUser() {
-        return createUser;
-    }
-
-    public void setCreateUser(String createUser) {
-        this.createUser = createUser == null ? null : createUser.trim();
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getModifiedUser() {
-        return modifiedUser;
-    }
-
-    public void setModifiedUser(String modifiedUser) {
-        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
-    }
-
-    public Date getModifiedTime() {
-        return modifiedTime;
-    }
-
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-
-    public String getGoodsUse() {
-        return goodsUse;
-    }
-
-    public void setGoodsUse(String goodsUse) {
-        this.goodsUse = goodsUse;
-    }
-
-    public Date getGoodsSaleDate() {
-        return goodsSaleDate;
-    }
-
-    public void setGoodsSaleDate(Date goodsSaleDate) {
-        this.goodsSaleDate = goodsSaleDate;
-    }
-
-    public String getProductTypeName() {
-        return productTypeName;
-    }
-
-    public void setProductTypeName(String productTypeName) {
-        this.productTypeName = productTypeName;
-    }
-
-    public BigDecimal getSaledCarbonSkin() {
-        return saledCarbonSkin;
-    }
-
-    public void setSaledCarbonSkin(BigDecimal saledCarbonSkin) {
-        this.saledCarbonSkin = saledCarbonSkin;
-    }
-
-    public BigDecimal getUnsaledCarbonSkin() {
-        return unsaledCarbonSkin;
-    }
-
-    public void setUnsaledCarbonSkin(BigDecimal unsaledCarbonSkin) {
-        this.unsaledCarbonSkin = unsaledCarbonSkin;
-    }
-
-    public String getSaleTargets() {
-        return saleTargets;
-    }
-
-    public void setSaleTargets(String saleTargets) {
-        this.saleTargets = saleTargets;
-    }
-
-    public String getSaleType() {
-        return saleType;
-    }
-
-    public void setSaleType(String saleType) {
-        this.saleType = saleType;
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsOrderInfo.java

@@ -1,146 +0,0 @@
-package com.hcloud.microserver.facade.carbon.entity;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class GoodsOrderInfo {
-    private String guid;
-
-    private String fkCustomerGuid;
-
-    private String orderNo;
-
-    private String customerName;
-
-    private String customerType;
-
-    private BigDecimal orderAmount;
-
-    private BigDecimal orderCarbonAmount;
-
-    private Integer orderStatus;
-
-    private Integer state;
-
-    private String createUser;
-
-    private Date createTime;
-
-    private String modifiedUser;
-
-    private Date modifiedTime;
-
-    private String payNo;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getFkCustomerGuid() {
-        return fkCustomerGuid;
-    }
-
-    public void setFkCustomerGuid(String fkCustomerGuid) {
-        this.fkCustomerGuid = fkCustomerGuid == null ? null : fkCustomerGuid.trim();
-    }
-
-    public String getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo == null ? null : orderNo.trim();
-    }
-
-    public BigDecimal getOrderAmount() {
-        return orderAmount;
-    }
-
-    public void setOrderAmount(BigDecimal orderAmount) {
-        this.orderAmount = orderAmount;
-    }
-
-    public BigDecimal getOrderCarbonAmount() {
-        return orderCarbonAmount;
-    }
-
-    public void setOrderCarbonAmount(BigDecimal orderCarbonAmount) {
-        this.orderCarbonAmount = orderCarbonAmount;
-    }
-
-    public Integer getOrderStatus() {
-        return orderStatus;
-    }
-
-    public void setOrderStatus(Integer orderStatus) {
-        this.orderStatus = orderStatus;
-    }
-
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public String getCreateUser() {
-        return createUser;
-    }
-
-    public void setCreateUser(String createUser) {
-        this.createUser = createUser == null ? null : createUser.trim();
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getModifiedUser() {
-        return modifiedUser;
-    }
-
-    public void setModifiedUser(String modifiedUser) {
-        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
-    }
-
-    public Date getModifiedTime() {
-        return modifiedTime;
-    }
-
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-
-    public String getCustomerName() {
-        return customerName;
-    }
-
-    public void setCustomerName(String customerName) {
-        this.customerName = customerName==null?null:customerName.trim();
-    }
-
-    public String getCustomerType() {
-        return customerType;
-    }
-
-    public void setCustomerType(String customerType) {
-        this.customerType = customerType==null?null:customerType.trim();
-    }
-
-    public String getPayNo() {
-        return payNo;
-    }
-
-    public void setPayNo(String payNo) {
-        this.payNo = payNo==null?null:payNo.trim();
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsPayOrder.java

@@ -1,116 +0,0 @@
-package com.hcloud.microserver.facade.carbon.entity;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class GoodsPayOrder {
-    private String guid;
-
-    private String fkCustomerId;
-
-    private String fkOrderId;
-
-    private String orderNo;
-
-    private String payNo;
-
-    private BigDecimal payAmount;
-
-    private Integer payChannel;
-
-    private Date payTime;
-
-    private Integer payStatus;
-
-    private Integer state;
-
-    private Date createTime;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getFkCustomerId() {
-        return fkCustomerId;
-    }
-
-    public void setFkCustomerId(String fkCustomerId) {
-        this.fkCustomerId = fkCustomerId == null ? null : fkCustomerId.trim();
-    }
-
-    public String getFkOrderId() {
-        return fkOrderId;
-    }
-
-    public void setFkOrderId(String fkOrderId) {
-        this.fkOrderId = fkOrderId == null ? null : fkOrderId.trim();
-    }
-
-    public String getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo == null ? null : orderNo.trim();
-    }
-
-    public String getPayNo() {
-        return payNo;
-    }
-
-    public void setPayNo(String payNo) {
-        this.payNo = payNo == null ? null : payNo.trim();
-    }
-
-    public BigDecimal getPayAmount() {
-        return payAmount;
-    }
-
-    public void setPayAmount(BigDecimal payAmount) {
-        this.payAmount = payAmount;
-    }
-
-    public Integer getPayChannel() {
-        return payChannel;
-    }
-
-    public void setPayChannel(Integer payChannel) {
-        this.payChannel = payChannel;
-    }
-
-    public Date getPayTime() {
-        return payTime;
-    }
-
-    public void setPayTime(Date payTime) {
-        this.payTime = payTime;
-    }
-
-    public Integer getPayStatus() {
-        return payStatus;
-    }
-
-    public void setPayStatus(Integer payStatus) {
-        this.payStatus = payStatus;
-    }
-
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GroupNumBO.java

@@ -1,24 +0,0 @@
-package com.hcloud.microserver.facade.carbon.entity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-@Data
-@ApiModel
-public class GroupNumBO implements Serializable {
-
-    private String num;
-
-    @ApiModelProperty("金钱")
-    private BigDecimal moneyNum;
-
-    @ApiModelProperty("碳汇量")
-    private BigDecimal carbonNum;
-
-    @ApiModelProperty("数量")
-    private long saleNum;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/ProductBelong.java

@@ -1,121 +0,0 @@
-package com.hcloud.microserver.facade.carbon.entity;
-
-import lombok.ToString;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-@ToString
-public class ProductBelong implements Serializable {
-    private static final long serialVersionUID = -5693556988379041946L;
-    private String guid;
-
-    private String fkProductGuid;
-
-    private String fkFarmerGuid;
-
-    private String fkCollectiveGuid;
-
-    private String farmerName;
-
-    private String farmerVillage;
-
-    private Integer farmerNum;
-
-    private Integer state;
-
-    private Date createTime;
-
-    private Date modifiedTime;
-
-    private Integer belongType;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getFkProductGuid() {
-        return fkProductGuid;
-    }
-
-    public void setFkProductGuid(String fkProductGuid) {
-        this.fkProductGuid = fkProductGuid == null ? null : fkProductGuid.trim();
-    }
-
-    public String getFkFarmerGuid() {
-        return fkFarmerGuid;
-    }
-
-    public void setFkFarmerGuid(String fkFarmerGuid) {
-        this.fkFarmerGuid = fkFarmerGuid == null ? null : fkFarmerGuid.trim();
-    }
-
-    public String getFkCollectiveGuid() {
-        return fkCollectiveGuid;
-    }
-
-    public void setFkCollectiveGuid(String fkCollectiveGuid) {
-        this.fkCollectiveGuid = fkCollectiveGuid;
-    }
-
-    public String getFarmerName() {
-        return farmerName;
-    }
-
-    public void setFarmerName(String farmerName) {
-        this.farmerName = farmerName == null ? null : farmerName.trim();
-    }
-
-    public String getFarmerVillage() {
-        return farmerVillage;
-    }
-
-    public void setFarmerVillage(String farmerVillage) {
-        this.farmerVillage = farmerVillage == null ? null : farmerVillage.trim();
-    }
-
-    public Integer getFarmerNum() {
-        return farmerNum;
-    }
-
-    public void setFarmerNum(Integer farmerNum) {
-        this.farmerNum = farmerNum;
-    }
-
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getModifiedTime() {
-        return modifiedTime;
-    }
-
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-
-    public Integer getBelongType() {
-        return belongType;
-    }
-
-    public void setBelongType(Integer belongType) {
-        this.belongType = belongType;
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/ProductExpansion.java

@@ -1,101 +0,0 @@
-package com.hcloud.microserver.facade.carbon.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-public class ProductExpansion implements Serializable {
-    private static final long serialVersionUID = -8280719751518169272L;
-    private String guid;
-
-    private String fkProductGuid;
-
-    private String fkProductTypeGuid;
-
-    private String expansionItem;
-
-    private String expansionVal;
-
-    private Integer state;
-
-    private Date createTime;
-
-    private Date modifiedTime;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getFkProductGuid() {
-        return fkProductGuid;
-    }
-
-    public void setFkProductGuid(String fkProductGuid) {
-        this.fkProductGuid = fkProductGuid == null ? null : fkProductGuid.trim();
-    }
-
-    public String getExpansionItem() {
-        return expansionItem;
-    }
-
-    public void setExpansionItem(String expansionItem) {
-        this.expansionItem = expansionItem == null ? null : expansionItem.trim();
-    }
-
-    public String getExpansionVal() {
-        return expansionVal;
-    }
-
-    public void setExpansionVal(String expansionVal) {
-        this.expansionVal = expansionVal == null ? null : expansionVal.trim();
-    }
-
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getModifiedTime() {
-        return modifiedTime;
-    }
-
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-
-    public String getFkProductTypeGuid() {
-        return fkProductTypeGuid;
-    }
-
-    public void setFkProductTypeGuid(String fkProductTypeGuid) {
-        this.fkProductTypeGuid = fkProductTypeGuid;
-    }
-
-    @Override
-    public String toString() {
-        return "ProductExpansion{" +
-                "guid='" + guid + '\'' +
-                ", fkProductGuid='" + fkProductGuid + '\'' +
-                ", fkProductTypeGuid='" + fkProductTypeGuid + '\'' +
-                ", expansionItem='" + expansionItem + '\'' +
-                ", expansionVal='" + expansionVal + '\'' +
-                ", state=" + state +
-                ", createTime=" + createTime +
-                ", modifiedTime=" + modifiedTime +
-                '}';
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/ProductTypeExpansion.java

@@ -1,85 +0,0 @@
-package com.hcloud.microserver.facade.carbon.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-public class ProductTypeExpansion implements Serializable {
-
-    private static final long serialVersionUID = 3286665272122183240L;
-    private String guid;
-    private String fkProductTypeGuid;
-    private String fkProductGuid;
-    private String expansionItem;
-    private Integer state;
-    private Date createTime;
-    private Date modifiedTime;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid;
-    }
-
-    public String getFkProductTypeGuid() {
-        return fkProductTypeGuid;
-    }
-
-    public void setFkProductTypeGuid(String fkProductTypeGuid) {
-        this.fkProductTypeGuid = fkProductTypeGuid;
-    }
-
-    public String getFkProductGuid() {
-        return fkProductGuid;
-    }
-
-    public void setFkProductGuid(String fkProductGuid) {
-        this.fkProductGuid = fkProductGuid;
-    }
-
-    public String getExpansionItem() {
-        return expansionItem;
-    }
-
-    public void setExpansionItem(String expansionItem) {
-        this.expansionItem = expansionItem;
-    }
-
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getModifiedTime() {
-        return modifiedTime;
-    }
-
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-
-    @Override
-    public String toString() {
-        return "ProductTypeExpansion{" +
-                "guid='" + guid + '\'' +
-                ", fkProductTypeGuid='" + fkProductTypeGuid + '\'' +
-                ", fkProductGuid='" + fkProductGuid + '\'' +
-                ", expansionItem='" + expansionItem + '\'' +
-                ", state=" + state +
-                ", createTime=" + createTime +
-                ", modifiedTime=" + modifiedTime +
-                '}';
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/CollectiveFarmerForm.java

@@ -1,64 +0,0 @@
-package com.hcloud.microserver.facade.carbon.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class CollectiveFarmerForm extends BaseForm {
-    private String guid;
-
-    private String fkPovertyAreaId;
-
-    private String collectiveCode;
-
-    private String collectiveName;
-
-    private Integer collectivePersonNum;
-
-    private String orgUnit;
-
-    private String remark;
-
-    private String collectiveImages;
-
-    private String bankName;
-
-    private String bankCardNo;
-
-    private Integer isEnable;
-
-    private Integer state;
-
-    private String createUser;
-
-    private Date createTime;
-
-    private String modifiedUser;
-
-    private Date modifiedTime;
-
-    private BigDecimal recieveMoney;
-
-    private BigDecimal actualMoney;
-
-    private String phone;
-
-    private String condition;
-
-    private List<FarmerInfoForm> farmerInfoForms;
-
-    private String provinceId;
-
-    private String cityId;
-
-    private String townId;
-
-    private String countyId;
-
-    private String villageId;
-
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/CustomerInfoForm.java

@@ -1,80 +0,0 @@
-package com.hcloud.microserver.facade.carbon.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * @author xiezt
- */
-@Data
-@Slf4j
-public class CustomerInfoForm extends BaseForm {
-
-    private String guid;
-
-    private String account;
-
-    private String passwd;
-
-    private Integer customerType;
-
-    private String customerName;
-
-    private String nickName;
-
-    private String pid;
-
-    private String phone;
-
-    private Integer sex;
-
-    private Integer score;
-
-    private String wxId;
-
-    private String unionId;
-
-    private String headImage;
-
-    private Integer isCompany;
-
-    private Integer isValidate;
-
-    private Integer isEnable;
-
-    private String queryStr;
-
-    private BigDecimal carbonAmount;
-
-    private Integer goodsNum;
-
-    private Integer farmerNum;
-
-    private Integer farmerPersonNum;
-    /**
-     * 购物车商品列表
-     */
-    private List<GoodsInfoForm> goodsList;
-
-    /**
-     * 登录渠道
-     */
-    private Integer loginType;
-
-    /**
-     * 企业认证信息
-     */
-    private CustomerCompanyInfoForm customerCompanyInfoForm;
-
-    /**
-     * 渠道类型
-     */
-    private Integer channelType;
-
-
-
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/DayCarbonFrom.java

@@ -1,14 +0,0 @@
-package com.hcloud.microserver.facade.carbon.forms;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-@ApiModel
-public class DayCarbonFrom implements Serializable {
-    @ApiModelProperty("时间参数")
-    private String dataFrom;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/FarmerInfoForm.java

@@ -1,80 +0,0 @@
-package com.hcloud.microserver.facade.carbon.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author xiezt
- */
-@Data
-public class FarmerInfoForm extends BaseForm {
-
-    private String guid;
-
-    private String fkPovertyAreaId;
-
-    private String fkCollectiveId;
-
-    private String farmerCode;
-
-    private String farmerName;
-
-    private Integer familyNum;
-
-    private Integer sex;
-
-    private String pid;
-
-    private String nation;
-
-    private String education;
-
-    private String phone;
-
-    private String bankCardNo;
-
-    private BigDecimal incomeVal;
-
-    private String farmerType;
-
-    private String farmerRemark;
-
-    private String farmerImages;
-
-    private String villageOrg;
-
-    private Integer isEnable;
-
-    private Integer state;
-
-    private String createUser;
-
-    private Date createTime;
-
-    private String modifiedUser;
-
-    private Date modifiedTime;
-
-    private String bankClearingMsg;
-
-    private BigDecimal recieveMoney;
-
-    private BigDecimal actualMoney;
-
-    private String condition;
-
-    private String provinceId;
-
-    private String cityId;
-
-    private String townId;
-
-    private String countyId;
-
-    private String villageId;
-
-    private Integer queryFlag;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GoodsDetailForm.java

@@ -1,37 +0,0 @@
-package com.hcloud.microserver.facade.carbon.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-public class GoodsDetailForm extends BaseForm {
-
-    private String guid;
-
-    private String fkGoodsGuid;
-
-    private String fkProductGuid;
-
-    private String productName;
-
-    private String productCode;
-
-    private String saleUnit;
-
-    private BigDecimal carbonVal;
-
-    private Integer isEnable;
-
-    private Integer farmerNums;
-
-    private Integer state;
-
-    private Date createTime;
-
-    private Date modifiedTime;
-
-    private String condition;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/OrderPayApplyForm.java

@@ -1,39 +0,0 @@
-package com.hcloud.microserver.facade.carbon.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author xiezt
- */
-@Data
-public class OrderPayApplyForm extends BaseForm {
-
-    private String guid;
-
-    private String fkCustomerId;
-
-    private String fkOrderId;
-
-    private String applyUserName;
-
-    private BigDecimal payAmount;
-
-    private String remark;
-
-    private Integer applyStatus;
-
-    private String orderNo;
-
-    private BigDecimal orderCarbonAmount;
-
-    private Integer orderStatus;
-
-    private String beginTime;
-
-    private String endTime;
-
-    private String account;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/OrderPayVoucherForm.java

@@ -1,45 +0,0 @@
-package com.hcloud.microserver.facade.carbon.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author xiezt
- */
-@Data
-public class OrderPayVoucherForm extends BaseForm {
-
-    private String guid;
-
-    private String fkOrderId;
-
-    private String fkCustomerId;
-
-    private String fkApplyId;
-
-    private String payUserName;
-
-    private String payBank;
-
-    private String payCardNo;
-
-    private BigDecimal payAmount;
-
-    private Date payTime;
-
-    private String voucherImages;
-
-    private Date beginDate;
-
-    private Date endDate;
-
-    private Integer orderStatus;
-
-    private String account;
-
-    private String orderNo;
-
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/PaymentForm.java

@@ -1,22 +0,0 @@
-package com.hcloud.microserver.facade.carbon.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class PaymentForm extends BaseForm {
-    private String orderId;
-    private String orderNo;
-    private String payNo;
-    private String orderTime;
-    private Integer orderStatus;
-    private String account;
-    private String customerName;
-    private String payBank;
-    private String payCardNo;
-    private String payChannel;
-    private String payAmount;
-    private String payTime;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/ProductExpansionForm.java

@@ -1,27 +0,0 @@
-package com.hcloud.microserver.facade.carbon.forms;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class ProductExpansionForm {
-
-    private String guid;
-
-    private String fkProductGuid;
-
-    private String fkProductTypeGuid;
-
-    private String expansionItem;
-
-    private String expansionVal;
-
-    private Integer state;
-
-    private Date createTime;
-
-    private Date modifiedTime;
-
-    private String condition;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/ProductInfoForm.java

@@ -1,59 +0,0 @@
-package com.hcloud.microserver.facade.carbon.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import com.hcloud.microserver.facade.carbon.entity.ProductType;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class ProductInfoForm extends BaseForm {
-    private String guid;
-
-    private String fkProductType;
-
-    private String fkCarbonRule;
-
-    private String fkPovertyArea;
-
-    private String productName;
-
-    private String productCode;
-
-    private Date carbonGenerateDate;
-
-    private Integer productValidateNum;
-
-    private Date carbonRefreshTime;
-
-    private BigDecimal carbonSink;
-
-    private String productImgs;
-
-    private Integer isEnable;
-
-    private String remark;
-
-    private Integer state;
-
-    private String createUser;
-
-    private Date createTime;
-
-    private String modifiedUser;
-
-    private Date modifiedTime;
-
-    private String condition;
-
-    private ProductType productType;
-
-    private List<ProductBelongForm> productBelongForms;
-
-    private List<ProductExpansionForm> productExpansionForms;
-
-    // 冗余一个贫困集体的参数
-    private CollectiveFarmerForm collectiveFarmerForm;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/CarbonManageApplication.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/CarbonManageApplication.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon;
+package com.hcloud.microserver.system.facade.carbon;
 
 import org.springframework.boot.SpringApplication;
 

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/BasePosition.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/BasePosition.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import lombok.Data;
 

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CarbonCalculateRule.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CarbonCalculateRule.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import java.util.Date;
 

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CarbonPlatformStatiticsNum.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CarbonPlatformStatiticsNum.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 
 import io.swagger.annotations.ApiModel;

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CarbonStatisticsBuyTrend.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CarbonStatisticsBuyTrend.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CarbonStatisticsFarmer.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CarbonStatisticsFarmer.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CarbonStatisticsProduct.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CarbonStatisticsProduct.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CollectiveFarmer.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CollectiveFarmer.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import lombok.ToString;
 

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CollectiveProductBelong.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CollectiveProductBelong.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import lombok.ToString;
 

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CustomerChannel.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CustomerChannel.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 /**
  * @author xiezt

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CustomerCompanyInfo.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CustomerCompanyInfo.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import lombok.ToString;
 

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CustomerCompanyType.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CustomerCompanyType.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import javax.validation.constraints.NotEmpty;
 import java.util.Date;

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CustomerInfo.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CustomerInfo.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import java.util.Date;
 

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/DayCarbonBO.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/DayCarbonBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/FarmerInfo.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/FarmerInfo.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import lombok.ToString;
 

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/FarmerProductBelong.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/FarmerProductBelong.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import lombok.ToString;
 

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsCredentialInfo.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsCredentialInfo.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import java.math.BigDecimal;
 import java.util.Date;

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsDetail.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsDetail.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsInfo.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsInfo.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import lombok.ToString;
 

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsOrderDetail.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsOrderDetail.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import java.math.BigDecimal;
 import java.util.Date;

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsOrderInfo.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsOrderInfo.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import java.math.BigDecimal;
 import java.util.Date;

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsPayOrder.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsPayOrder.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import java.math.BigDecimal;
 import java.util.Date;

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsSaleInfo.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsSaleInfo.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import lombok.ToString;
 

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GroupNumBO.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GroupNumBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/OrderPayApply.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/OrderPayApply.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import java.math.BigDecimal;
 import java.util.Date;

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/OrderPayVoucher.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/OrderPayVoucher.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import java.math.BigDecimal;
 import java.util.Date;

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/PovertyArea.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/PovertyArea.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import lombok.Data;
 

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/ProductBelong.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/ProductBelong.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import lombok.ToString;
 

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/ProductExpansion.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/ProductExpansion.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import java.io.Serializable;
 import java.util.Date;

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/ProductInfo.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/ProductInfo.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import lombok.ToString;
 

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/ProductType.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/ProductType.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import lombok.ToString;
 

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/ProductTypeExpansion.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/ProductTypeExpansion.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import java.io.Serializable;
 import java.util.Date;

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/UserBuyBO.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/UserBuyBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.entity;
+package com.hcloud.microserver.system.facade.carbon.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/CarbonTrendForm.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/CarbonTrendForm.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.forms;
+package com.hcloud.microserver.system.facade.carbon.forms;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.hcloud.microserver.commoncore.base.BaseForm;

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/CollectiveFarmerForm.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/CollectiveFarmerForm.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.forms;
+package com.hcloud.microserver.system.facade.carbon.forms;
 
 import com.hcloud.microserver.commoncore.base.BaseForm;
 import lombok.Data;

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/CustomerChannelForm.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/CustomerChannelForm.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.forms;
+package com.hcloud.microserver.system.facade.carbon.forms;
 
 import com.hcloud.microserver.commoncore.base.BaseForm;
 import lombok.Data;

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/CustomerCompanyInfoForm.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/CustomerCompanyInfoForm.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.forms;
+package com.hcloud.microserver.system.facade.carbon.forms;
 
 import com.hcloud.microserver.commoncore.base.BaseForm;
 import lombok.Data;

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/CustomerCompanyTypeForm.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/CustomerCompanyTypeForm.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.forms;
+package com.hcloud.microserver.system.facade.carbon.forms;
 
 import com.hcloud.microserver.commoncore.base.BaseForm;
 import io.swagger.annotations.Api;

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/CustomerInfoForm.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/CustomerInfoForm.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.forms;
+package com.hcloud.microserver.system.facade.carbon.forms;
 
 import com.hcloud.microserver.commoncore.base.BaseForm;
 import lombok.Data;

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/DayCarbonFrom.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/DayCarbonFrom.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.forms;
+package com.hcloud.microserver.system.facade.carbon.forms;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/FarmerInfoForm.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/FarmerInfoForm.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.forms;
+package com.hcloud.microserver.system.facade.carbon.forms;
 
 import com.hcloud.microserver.commoncore.base.BaseForm;
 import lombok.Data;

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GoodsCredentialInfoForm.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/GoodsCredentialInfoForm.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.forms;
+package com.hcloud.microserver.system.facade.carbon.forms;
 
 import com.hcloud.microserver.commoncore.base.BaseForm;
 import lombok.Data;

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GoodsDetailForm.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/GoodsDetailForm.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.forms;
+package com.hcloud.microserver.system.facade.carbon.forms;
 
 import com.hcloud.microserver.commoncore.base.BaseForm;
 import lombok.Data;

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GoodsInfoForm.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/GoodsInfoForm.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.forms;
+package com.hcloud.microserver.system.facade.carbon.forms;
 
 import com.hcloud.microserver.commoncore.base.BaseForm;
 import lombok.Data;

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GoodsOrderDetailForm.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/GoodsOrderDetailForm.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.forms;
+package com.hcloud.microserver.system.facade.carbon.forms;
 
 import com.hcloud.microserver.commoncore.base.BaseForm;
 import lombok.Data;

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GoodsOrderInfoForm.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/GoodsOrderInfoForm.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.forms;
+package com.hcloud.microserver.system.facade.carbon.forms;
 
 import com.hcloud.microserver.commoncore.base.BaseForm;
 import lombok.Data;

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GoodsPayOrderForm.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/GoodsPayOrderForm.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.forms;
+package com.hcloud.microserver.system.facade.carbon.forms;
 
 import com.hcloud.microserver.commoncore.base.BaseForm;
 import lombok.Data;

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GoodsSaleInfoForm.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/GoodsSaleInfoForm.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.forms;
+package com.hcloud.microserver.system.facade.carbon.forms;
 
 import com.hcloud.microserver.commoncore.base.BaseForm;
 import lombok.Data;

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GroupNumFrom.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/GroupNumFrom.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.forms;
+package com.hcloud.microserver.system.facade.carbon.forms;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/OrderPayApplyForm.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/OrderPayApplyForm.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.forms;
+package com.hcloud.microserver.system.facade.carbon.forms;
 
 import com.hcloud.microserver.commoncore.base.BaseForm;
 import lombok.Data;

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/OrderPayVoucherForm.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/OrderPayVoucherForm.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.forms;
+package com.hcloud.microserver.system.facade.carbon.forms;
 
 import com.hcloud.microserver.commoncore.base.BaseForm;
 import lombok.Data;

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/PaymentForm.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/PaymentForm.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.forms;
+package com.hcloud.microserver.system.facade.carbon.forms;
 
 import com.hcloud.microserver.commoncore.base.BaseForm;
 import lombok.Data;

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/PovertyAreaForm.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/PovertyAreaForm.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.forms;
+package com.hcloud.microserver.system.facade.carbon.forms;
 
 import com.hcloud.microserver.commoncore.base.BaseForm;
 import lombok.Data;

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/ProductBelongForm.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/ProductBelongForm.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.forms;
+package com.hcloud.microserver.system.facade.carbon.forms;
 
 import com.hcloud.microserver.commoncore.base.BaseForm;
 import lombok.Data;

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/ProductExpansionForm.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/ProductExpansionForm.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.forms;
+package com.hcloud.microserver.system.facade.carbon.forms;
 
 import lombok.Data;
 

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/ProductInfoForm.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/ProductInfoForm.java

@@ -1,7 +1,7 @@
-package com.hcloud.microserver.facade.carbon.forms;
+package com.hcloud.microserver.system.facade.carbon.forms;
 
 import com.hcloud.microserver.commoncore.base.BaseForm;
-import com.hcloud.microserver.facade.carbon.entity.ProductType;
+import com.hcloud.microserver.system.facade.carbon.entity.ProductType;
 import lombok.Data;
 
 import java.math.BigDecimal;

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/ProductTypeExpansionForm.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/ProductTypeExpansionForm.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.forms;
+package com.hcloud.microserver.system.facade.carbon.forms;
 
 import lombok.Data;
 

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/ProductTypeForm.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/ProductTypeForm.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.forms;
+package com.hcloud.microserver.system.facade.carbon.forms;
 
 import com.hcloud.microserver.commoncore.base.BaseForm;
 import lombok.Data;

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/UserBuyFrom.java → carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/UserBuyFrom.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.facade.carbon.forms;
+package com.hcloud.microserver.system.facade.carbon.forms;
 
 import lombok.Data;
 

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/dao/CarbonStatisticsMapper.java

@@ -1,19 +0,0 @@
-package com.hcloud.microserver.bank.dao;
-
-import com.hcloud.microserver.facade.carbon.entity.CarbonPlatformStatiticsNum;
-import com.hcloud.microserver.facade.carbon.entity.CarbonStatisticsBuyTrend;
-import com.hcloud.microserver.facade.carbon.entity.CarbonStatisticsProduct;
-import com.hcloud.microserver.facade.carbon.forms.CarbonTrendForm;
-
-import java.util.List;
-
-public interface CarbonStatisticsMapper {
-
-    public CarbonPlatformStatiticsNum carbonPlatformTotalStatitics();
-
-    public List<CarbonStatisticsProduct> carbonProductDetailStatistics();
-
-    public  List<CarbonStatisticsBuyTrend> carbonStatisticsBuyTrend(CarbonTrendForm carbonTrendForm);
-
-
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/service/WebIndexService.java

@@ -1,18 +0,0 @@
-package com.hcloud.microserver.bank.service;
-
-import com.hcloud.microserver.facade.carbon.entity.DayCarbonBO;
-import com.hcloud.microserver.facade.carbon.entity.GroupNumBO;
-import com.hcloud.microserver.facade.carbon.entity.UserBuyBO;
-import com.hcloud.microserver.facade.carbon.forms.DayCarbonFrom;
-import com.hcloud.microserver.facade.carbon.forms.GroupNumFrom;
-import com.hcloud.microserver.facade.carbon.forms.UserBuyFrom;
-
-import java.util.List;
-
-public interface WebIndexService {
-    DayCarbonBO dayCarbon(DayCarbonFrom dayCarbonFrom);
-
-    List<UserBuyBO> userBuy(UserBuyFrom userBuyFrom);
-
-    List<GroupNumBO> GroupNum(GroupNumFrom userBuyFrom);
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/bo/CarbonBaseController.java → carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/system/bank/bo/CarbonBaseController.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.system.bank.bo;
 
 import com.hcloud.microserver.commoncore.base.BaseController;
 import com.hcloud.microserver.commoncore.base.ResponseBase;

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/bo/CompanyBO.java → carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/system/bank/bo/CompanyBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.system.bank.bo;
 
 import lombok.Data;
 

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/bo/CredentialInfoBO.java → carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/system/bank/bo/CredentialInfoBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.system.bank.bo;
 
 import lombok.Data;
 

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/bo/CustomerInfoBO.java → carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/system/bank/bo/CustomerInfoBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.system.bank.bo;
 
 import lombok.Data;
 

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/bo/FarmerInfoBO.java → carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/system/bank/bo/FarmerInfoBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.system.bank.bo;
 
 import lombok.Data;
 

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/bo/GoodsDetailBO.java → carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/system/bank/bo/GoodsDetailBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.system.bank.bo;
 
 import lombok.Data;
 

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/bo/GoodsInfoBO.java → carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/system/bank/bo/GoodsInfoBO.java

@@ -1,7 +1,7 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.system.bank.bo;
 
-import com.hcloud.microserver.facade.carbon.entity.GoodsDetail;
-import com.hcloud.microserver.facade.carbon.entity.ProductInfo;
+import com.hcloud.microserver.system.facade.carbon.entity.GoodsDetail;
+import com.hcloud.microserver.system.facade.carbon.entity.ProductInfo;
 import lombok.Data;
 
 import java.math.BigDecimal;

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/bo/GoodsPayOrderBO.java → carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/system/bank/bo/GoodsPayOrderBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.system.bank.bo;
 
 import lombok.Data;
 

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/bo/OrderDetailBO.java → carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/system/bank/bo/OrderDetailBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.system.bank.bo;
 
 import lombok.Data;
 

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/bo/OrderDetailInfoBO.java → carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/system/bank/bo/OrderDetailInfoBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.system.bank.bo;
 
 import lombok.Data;
 

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/bo/OrderInfoBO.java → carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/system/bank/bo/OrderInfoBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.system.bank.bo;
 
 import lombok.Data;
 

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/bo/OrderPayApplyBO.java → carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/system/bank/bo/OrderPayApplyBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.system.bank.bo;
 
 import lombok.Data;
 

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/bo/PayApplyInfoBO.java → carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/system/bank/bo/PayApplyInfoBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.system.bank.bo;
 
 import lombok.Data;
 

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/bo/PayVoucherBO.java → carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/system/bank/bo/PayVoucherBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.system.bank.bo;
 
 import lombok.Data;
 

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/bo/PaymentBO.java → carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/system/bank/bo/PaymentBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.system.bank.bo;
 
 import lombok.Data;