# Conflicts: # mall-server-front/src/main/java/com/fzm/mall/server/front/asset/model/UserAsset.java # mall-sql/mall_create.sql
# Conflicts: # mall-server-admin/src/main/resources/mapper/goods_center/GoodsSkuUsufructMapper.xml # mall-sql/mall_create.sql
