Merge branch 'master' of http://git.zthymaoyi.com/wangchao/businessCard

.gitignore

@@ -72,192 +72,8 @@ unimall.log.*.tmp
 ### xcx ###
 .map/
 /unpackage/
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-upload/u-upload.wxss
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-upload/u-upload.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-upload/u-upload.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-transition/u-transition.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-toolbar/u-toolbar.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-toolbar/u-toolbar.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-textarea/u-textarea.wxss
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-list-item/u-list-item.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-line/u-line.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-line/u-line.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-input/u-input.wxss
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-input/u-input.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-input/u-input.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-icon/u-icon.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-icon/u-icon.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-form/u-form.wxml
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-form/u-form.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-form/u-form.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-form-item/u-form-item.wxss
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-form-item/u-form-item.wxml
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-form-item/u-form-item.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-form-item/u-form-item.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-checkbox/u-checkbox.wxss
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/lyuan-tx-asr/components/lyuan-tx-asr/lyuan-tx-asr.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/lyuan-tx-asr/components/lyuan-tx-asr/lyuan-tx-asr.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/d-search-log/components/d-search-log/d-search-log.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/project.config.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/mySet/set.json
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-modal/u-modal.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-list/u-list.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-list-item/u-list-item.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-line/u-line.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-input/u-input.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-icon/u-icon.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-form/u-form.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-form-item/u-form-item.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-checkbox/u-checkbox.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-badge/u-badge.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u--textarea/u--textarea.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u--input/u--input.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u--form/u--form.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/lyuan-tx-asr/components/lyuan-tx-asr/lyuan-tx-asr.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/d-search-log/components/d-search-log/d-search-log.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mySet/set.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mySet/newCard.js.map
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-swiper/u-swiper.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-swiper/u-swiper.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.wxss
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-status-bar/u-status-bar.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-status-bar/u-status-bar.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-popup/u-popup.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-picker/u-picker.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-overlay/u-overlay.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-navbar/u-navbar.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-navbar/u-navbar.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-modal/u-modal.wxss
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-modal/u-modal.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-modal/u-modal.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u--textarea/u--textarea.wxml
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u--textarea/u--textarea.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u--textarea/u--textarea.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u--input/u--input.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u--input/u--input.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u--form/u--form.wxml
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u--form/u--form.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u--form/u--form.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.wxss
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.wxss
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.wxss
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/circle/changeCard.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/cardHolder/search.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/cardHolder/notice.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/cardHolder/map.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/cardHolder/cardHolder.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/common/vendor.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/common/runtime.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/common/main.wxss
-xiaochengxu/unpackage/dist/dev/mp-weixin/common/main.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/app.json
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-upload/u-upload.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-transition/u-transition.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-toolbar/u-toolbar.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-textarea/u-textarea.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-switch/u-switch.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-swiper/u-swiper.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-status-bar/u-status-bar.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-popup/u-popup.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-picker/u-picker.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-overlay/u-overlay.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-navbar/u-navbar.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mySet/mySet.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mySet/myInfo.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mySet/myHome.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mySet/myCard.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mySet/myAccount.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mySet/help.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mySet/editHome.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mySet/contactCustomer.js.map
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-textarea/u-textarea.wxml
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-textarea/u-textarea.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-textarea/u-textarea.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-switch/u-switch.wxss
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-switch/u-switch.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-switch/u-switch.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-swiper/u-swiper.wxss
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-list/u-list.wxss
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-list/u-list.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-list/u-list.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-list-item/u-list-item.wxss
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-list-item/u-list-item.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-checkbox/u-checkbox.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-checkbox/u-checkbox.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-checkbox-group/u-checkbox-group.wxss
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-checkbox-group/u-checkbox-group.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-checkbox-group/u-checkbox-group.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-badge/u-badge.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-badge/u-badge.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/mySet/set.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/mySet/newCard.wxss
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/mySet/newCard.wxml
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/mySet/newCard.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/mySet/newCard.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/mySet/mySet.wxss
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/mySet/mySet.wxml
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/mySet/mySet.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/mySet/mySet.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/mySet/myInfo.wxss
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/mySet/myInfo.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/mySet/myInfo.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/mySet/myHome.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/mySet/myHome.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/mySet/myCard.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/mySet/myCard.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/mySet/myAccount.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/mySet/myAccount.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/mySet/help.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/mySet/help.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/mySet/editHome.wxml
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/mySet/editHome.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/mySet/editHome.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/mySet/contactCustomer.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/mySet/contactCustomer.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/mySet/cardType.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/mySet/cardType.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/circle/search.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/circle/search.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/circle/detail.wxss
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/circle/detail.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/circle/detail.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/circle/createCirclce.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/circle/createCirclce.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/circle/circle.wxss
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/circle/circle.json
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/circle/circle.js
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/circle/changeCard.wxss
-xiaochengxu/unpackage/dist/dev/mp-weixin/pages/circle/changeCard.json
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mySet/cardType.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/pages/circle/search.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/pages/circle/detail.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/pages/circle/createCirclce.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/pages/circle/circle.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/pages/circle/changeCard.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/pages/cardHolder/search.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/pages/cardHolder/notice.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/pages/cardHolder/map.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/pages/cardHolder/cardHolder.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
-xiaochengxu/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
+*.js
+*.wxss
+*.json
+*.wxml
+xiaochengxu/

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICardClassifyInfoService.java

@@ -1,7 +1,7 @@
-package com.iotechn.unimall.admin.api.unimall;
+package com.iotechn.unimall.admin.api.card;
 
 
-import com.iotechn.unimall.data.domain.unimall.CardClassifyInfo;
+import com.iotechn.unimall.data.domain.CardClassifyInfo;
 import com.iotechn.unimall.core.annotation.HttpMethod;
 import com.iotechn.unimall.core.annotation.HttpOpenApi;
 import com.iotechn.unimall.core.annotation.HttpParam;

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICardHolderInfoService.java

@@ -1,7 +1,7 @@
-package com.iotechn.unimall.admin.api.unimall;
+package com.iotechn.unimall.admin.api.card;
 
 
-import com.iotechn.unimall.data.domain.unimall.CardHolderInfo;
+import com.iotechn.unimall.data.domain.CardHolderInfo;
 import com.iotechn.unimall.core.annotation.HttpMethod;
 import com.iotechn.unimall.core.annotation.HttpOpenApi;
 import com.iotechn.unimall.core.annotation.HttpParam;

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICardManagementInfoService.java

@@ -1,7 +1,7 @@
-package com.iotechn.unimall.admin.api.unimall;
+package com.iotechn.unimall.admin.api.card;
 
 
-import com.iotechn.unimall.data.domain.unimall.CardManagementInfo;
+import com.iotechn.unimall.data.domain.CardManagementInfo;
 import com.iotechn.unimall.core.annotation.HttpMethod;
 import com.iotechn.unimall.core.annotation.HttpOpenApi;
 import com.iotechn.unimall.core.annotation.HttpParam;

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICertificateManagementInfoService.java

@@ -1,7 +1,7 @@
-package com.iotechn.unimall.admin.api.unimall;
+package com.iotechn.unimall.admin.api.card;
 
 
-import com.iotechn.unimall.data.domain.unimall.CertificateManagementInfo;
+import com.iotechn.unimall.data.domain.CertificateManagementInfo;
 import com.iotechn.unimall.core.annotation.HttpMethod;
 import com.iotechn.unimall.core.annotation.HttpOpenApi;
 import com.iotechn.unimall.core.annotation.HttpParam;

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICircleCardInfoService.java

@@ -1,7 +1,7 @@
-package com.iotechn.unimall.admin.api.unimall;
+package com.iotechn.unimall.admin.api.card;
 
 
-import com.iotechn.unimall.data.domain.unimall.CircleCardInfo;
+import com.iotechn.unimall.data.domain.CircleCardInfo;
 import com.iotechn.unimall.core.annotation.HttpMethod;
 import com.iotechn.unimall.core.annotation.HttpOpenApi;
 import com.iotechn.unimall.core.annotation.HttpParam;
@@ -25,8 +25,8 @@ public interface ICircleCardInfoService{
 
 	@HttpMethod(description = "列表", permissionName = "圈子个人关系管理")
 	public Page<CircleCardInfo> list(
-					@HttpParam(name = "comId", type = HttpParamType.COMMON, description = "圈子id") String comId,
-							@HttpParam(name = "identityId", type = HttpParamType.COMMON, description = "名片id") String identityId,
+					@HttpParam(name = "circleId", type = HttpParamType.COMMON, description = "圈子id") String circleId,
+							@HttpParam(name = "cardId", type = HttpParamType.COMMON, description = "名片id") String cardId,
 							@HttpParam(name = "commonId", type = HttpParamType.COMMON, description = "个人id") String commonId,
 							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
 							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
@@ -36,19 +36,19 @@ public interface ICircleCardInfoService{
 		throws ServiceException;
 
 	@HttpMethod(description = "删除", permissionName = "圈子个人关系管理")
-	public Boolean delete(@NotNull @HttpParam(name = "comId", type = HttpParamType.COMMON, description = "圈子id")String comId)throws ServiceException;
+	public Boolean delete(@NotNull @HttpParam(name = "circleId", type = HttpParamType.COMMON, description = "圈子id")String circleId)throws ServiceException;
 
 	@HttpMethod(description = "修改",  permissionName = "圈子个人关系管理")
 	public Boolean update(@NotNull @HttpParam(name = "circleCardInfo", type = HttpParamType.COMMON, description = "圈子个人关系") CircleCardInfo circleCardInfo,
 						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
 
 	@HttpMethod(description = "查询",  permissionName = "圈子个人关系管理")
-	public CircleCardInfo get(@NotNull @HttpParam(name = "comId", type = HttpParamType.COMMON, description = "圈子id")String comId)throws ServiceException;
+	public CircleCardInfo get(@NotNull @HttpParam(name = "circleId", type = HttpParamType.COMMON, description = "圈子id")String circleId)throws ServiceException;
 	
 	@HttpMethod(description = "导出excl表", permissionName = "圈子个人关系管理")
 	public String export(
-					@HttpParam(name = "comId", type = HttpParamType.COMMON, description = "圈子id") String comId,
-							@HttpParam(name = "identityId", type = HttpParamType.COMMON, description = "名片id") String identityId,
+					@HttpParam(name = "circleId", type = HttpParamType.COMMON, description = "圈子id") String circleId,
+							@HttpParam(name = "cardId", type = HttpParamType.COMMON, description = "名片id") String cardId,
 							@HttpParam(name = "commonId", type = HttpParamType.COMMON, description = "个人id") String commonId,
 							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
 							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICircleManagementInfoService.java

@@ -1,7 +1,7 @@
-package com.iotechn.unimall.admin.api.unimall;
+package com.iotechn.unimall.admin.api.card;
 
 
-import com.iotechn.unimall.data.domain.unimall.CircleManagementInfo;
+import com.iotechn.unimall.data.domain.CircleManagementInfo;
 import com.iotechn.unimall.core.annotation.HttpMethod;
 import com.iotechn.unimall.core.annotation.HttpOpenApi;
 import com.iotechn.unimall.core.annotation.HttpParam;

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICommonUserInfoService.java

@@ -1,7 +1,7 @@
-package com.iotechn.unimall.admin.api.unimall;
+package com.iotechn.unimall.admin.api.card;
 
 
-import com.iotechn.unimall.data.domain.unimall.CommonUserInfo;
+import com.iotechn.unimall.data.domain.CommonUserInfo;
 import com.iotechn.unimall.core.annotation.HttpMethod;
 import com.iotechn.unimall.core.annotation.HttpOpenApi;
 import com.iotechn.unimall.core.annotation.HttpParam;

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/IPersonalHomepageInfoService.java

@@ -1,7 +1,7 @@
-package com.iotechn.unimall.admin.api.unimall;
+package com.iotechn.unimall.admin.api.card;
 
 
-import com.iotechn.unimall.data.domain.unimall.PersonalHomepageInfo;
+import com.iotechn.unimall.data.domain.PersonalHomepageInfo;
 import com.iotechn.unimall.core.annotation.HttpMethod;
 import com.iotechn.unimall.core.annotation.HttpOpenApi;
 import com.iotechn.unimall.core.annotation.HttpParam;

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ISearchRecordsInfoService.java

@@ -1,7 +1,7 @@
-package com.iotechn.unimall.admin.api.unimall;
+package com.iotechn.unimall.admin.api.card;
 
 
-import com.iotechn.unimall.data.domain.unimall.SearchRecordsInfo;
+import com.iotechn.unimall.data.domain.SearchRecordsInfo;
 import com.iotechn.unimall.core.annotation.HttpMethod;
 import com.iotechn.unimall.core.annotation.HttpOpenApi;
 import com.iotechn.unimall.core.annotation.HttpParam;

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CardClassifyInfoServiceImpl.java

@@ -1,4 +1,4 @@
-package com.iotechn.unimall.admin.api.unimall;
+package com.iotechn.unimall.admin.api.card.impl;
 
 import java.util.List;
 
@@ -11,9 +11,9 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.iotechn.unimall.core.exception.ServiceException;
 import com.iotechn.unimall.data.util.ExcelUtil;
-import com.iotechn.unimall.data.mapper.unimall.CardClassifyInfoMapper;
-import com.iotechn.unimall.data.domain.unimall.CardClassifyInfo;
-import com.iotechn.unimall.admin.api.unimall.ICardClassifyInfoService;
+import com.iotechn.unimall.data.mapper.CardClassifyInfoMapper;
+import com.iotechn.unimall.data.domain.CardClassifyInfo;
+import com.iotechn.unimall.admin.api.card.ICardClassifyInfoService;
 import com.iotechn.unimall.data.model.Page;
 import java.util.Date;
 import org.springframework.transaction.annotation.Transactional;

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CardHolderInfoServiceImpl.java

@@ -1,4 +1,4 @@
-package com.iotechn.unimall.admin.api.unimall;
+package com.iotechn.unimall.admin.api.card.impl;
 
 import java.util.List;
 
@@ -11,9 +11,9 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.iotechn.unimall.core.exception.ServiceException;
 import com.iotechn.unimall.data.util.ExcelUtil;
-import com.iotechn.unimall.data.mapper.unimall.CardHolderInfoMapper;
-import com.iotechn.unimall.data.domain.unimall.CardHolderInfo;
-import com.iotechn.unimall.admin.api.unimall.ICardHolderInfoService;
+import com.iotechn.unimall.data.mapper.CardHolderInfoMapper;
+import com.iotechn.unimall.data.domain.CardHolderInfo;
+import com.iotechn.unimall.admin.api.card.ICardHolderInfoService;
 import com.iotechn.unimall.data.model.Page;
 import java.util.Date;
 import org.springframework.transaction.annotation.Transactional;

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CardManagementInfoServiceImpl.java

@@ -1,4 +1,4 @@
-package com.iotechn.unimall.admin.api.unimall;
+package com.iotechn.unimall.admin.api.card.impl;
 
 import java.util.List;
 
@@ -11,9 +11,9 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.iotechn.unimall.core.exception.ServiceException;
 import com.iotechn.unimall.data.util.ExcelUtil;
-import com.iotechn.unimall.data.mapper.unimall.CardManagementInfoMapper;
-import com.iotechn.unimall.data.domain.unimall.CardManagementInfo;
-import com.iotechn.unimall.admin.api.unimall.ICardManagementInfoService;
+import com.iotechn.unimall.data.mapper.CardManagementInfoMapper;
+import com.iotechn.unimall.data.domain.CardManagementInfo;
+import com.iotechn.unimall.admin.api.card.ICardManagementInfoService;
 import com.iotechn.unimall.data.model.Page;
 import java.util.Date;
 import org.springframework.transaction.annotation.Transactional;

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CertificateManagementInfoServiceImpl.java

@@ -1,4 +1,4 @@
-package com.iotechn.unimall.admin.api.unimall;
+package com.iotechn.unimall.admin.api.card.impl;
 
 import java.util.List;
 
@@ -11,9 +11,9 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.iotechn.unimall.core.exception.ServiceException;
 import com.iotechn.unimall.data.util.ExcelUtil;
-import com.iotechn.unimall.data.mapper.unimall.CertificateManagementInfoMapper;
-import com.iotechn.unimall.data.domain.unimall.CertificateManagementInfo;
-import com.iotechn.unimall.admin.api.unimall.ICertificateManagementInfoService;
+import com.iotechn.unimall.data.mapper.CertificateManagementInfoMapper;
+import com.iotechn.unimall.data.domain.CertificateManagementInfo;
+import com.iotechn.unimall.admin.api.card.ICertificateManagementInfoService;
 import com.iotechn.unimall.data.model.Page;
 import java.util.Date;
 import org.springframework.transaction.annotation.Transactional;

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CircleCardInfoServiceImpl.java

@@ -1,4 +1,4 @@
-package com.iotechn.unimall.admin.api.unimall;
+package com.iotechn.unimall.admin.api.card.impl;
 
 import java.util.List;
 
@@ -11,9 +11,9 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.iotechn.unimall.core.exception.ServiceException;
 import com.iotechn.unimall.data.util.ExcelUtil;
-import com.iotechn.unimall.data.mapper.unimall.CircleCardInfoMapper;
-import com.iotechn.unimall.data.domain.unimall.CircleCardInfo;
-import com.iotechn.unimall.admin.api.unimall.ICircleCardInfoService;
+import com.iotechn.unimall.data.mapper.CircleCardInfoMapper;
+import com.iotechn.unimall.data.domain.CircleCardInfo;
+import com.iotechn.unimall.admin.api.card.ICircleCardInfoService;
 import com.iotechn.unimall.data.model.Page;
 import java.util.Date;
 import org.springframework.transaction.annotation.Transactional;
@@ -39,13 +39,13 @@ public class CircleCardInfoServiceImpl implements ICircleCardInfoService{
 	}
 
 	@Override
-	public Page<CircleCardInfo> list(String comId,String identityId,String commonId,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
+	public Page<CircleCardInfo> list(String circleId,String cardId,String commonId,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
 		Wrapper<CircleCardInfo> wrapper = new EntityWrapper<CircleCardInfo>();
-									if (!StringUtils.isEmpty(comId)) {
-					wrapper.eq("com_id", comId);
+									if (!StringUtils.isEmpty(circleId)) {
+					wrapper.eq("circle_id", circleId);
 				}
-												if (!StringUtils.isEmpty(identityId)) {
-					wrapper.eq("identity_id", identityId);
+												if (!StringUtils.isEmpty(cardId)) {
+					wrapper.eq("card_id", cardId);
 				}
 												if (!StringUtils.isEmpty(commonId)) {
 					wrapper.eq("common_id", commonId);
@@ -67,8 +67,8 @@ public class CircleCardInfoServiceImpl implements ICircleCardInfoService{
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public Boolean delete(String comId) {
-		String[] ids = String.valueOf(comId).split(",");
+	public Boolean delete(String circleId) {
+		String[] ids = String.valueOf(circleId).split(",");
 		for (String tt:ids) {
 			CircleCardInfo tmp =  circleCardInfoMapper.selectById(Long.parseLong(tt));
 			if(tmp != null){
@@ -88,18 +88,18 @@ public class CircleCardInfoServiceImpl implements ICircleCardInfoService{
 	}
 
 	@Override
-	public CircleCardInfo get(String comId) throws ServiceException {
-		return circleCardInfoMapper.selectById(comId);
+	public CircleCardInfo get(String circleId) throws ServiceException {
+		return circleCardInfoMapper.selectById(circleId);
 	}
 	
 	@Override
-	public String export(String comId,String identityId,String commonId,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
+	public String export(String circleId,String cardId,String commonId,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
 		Wrapper<CircleCardInfo> wrapper = new EntityWrapper<CircleCardInfo>();
-									if (!StringUtils.isEmpty(comId)) {
-					wrapper.eq("com_id", comId);
+									if (!StringUtils.isEmpty(circleId)) {
+					wrapper.eq("circle_id", circleId);
 				}
-												if (!StringUtils.isEmpty(identityId)) {
-					wrapper.eq("identity_id", identityId);
+												if (!StringUtils.isEmpty(cardId)) {
+					wrapper.eq("card_id", cardId);
 				}
 												if (!StringUtils.isEmpty(commonId)) {
 					wrapper.eq("common_id", commonId);

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CircleManagementInfoServiceImpl.java

@@ -1,4 +1,4 @@
-package com.iotechn.unimall.admin.api.unimall;
+package com.iotechn.unimall.admin.api.card.impl;
 
 import java.util.List;
 
@@ -11,9 +11,9 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.iotechn.unimall.core.exception.ServiceException;
 import com.iotechn.unimall.data.util.ExcelUtil;
-import com.iotechn.unimall.data.mapper.unimall.CircleManagementInfoMapper;
-import com.iotechn.unimall.data.domain.unimall.CircleManagementInfo;
-import com.iotechn.unimall.admin.api.unimall.ICircleManagementInfoService;
+import com.iotechn.unimall.data.mapper.CircleManagementInfoMapper;
+import com.iotechn.unimall.data.domain.CircleManagementInfo;
+import com.iotechn.unimall.admin.api.card.ICircleManagementInfoService;
 import com.iotechn.unimall.data.model.Page;
 import java.util.Date;
 import org.springframework.transaction.annotation.Transactional;

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CommonUserInfoServiceImpl.java

@@ -1,4 +1,4 @@
-package com.iotechn.unimall.admin.api.unimall;
+package com.iotechn.unimall.admin.api.card.impl;
 
 import java.util.List;
 
@@ -11,9 +11,9 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.iotechn.unimall.core.exception.ServiceException;
 import com.iotechn.unimall.data.util.ExcelUtil;
-import com.iotechn.unimall.data.mapper.unimall.CommonUserInfoMapper;
-import com.iotechn.unimall.data.domain.unimall.CommonUserInfo;
-import com.iotechn.unimall.admin.api.unimall.ICommonUserInfoService;
+import com.iotechn.unimall.data.mapper.CommonUserInfoMapper;
+import com.iotechn.unimall.data.domain.CommonUserInfo;
+import com.iotechn.unimall.admin.api.card.ICommonUserInfoService;
 import com.iotechn.unimall.data.model.Page;
 import java.util.Date;
 import org.springframework.transaction.annotation.Transactional;

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/PersonalHomepageInfoServiceImpl.java

@@ -1,4 +1,4 @@
-package com.iotechn.unimall.admin.api.unimall;
+package com.iotechn.unimall.admin.api.card.impl;
 
 import java.util.List;
 
@@ -11,9 +11,9 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.iotechn.unimall.core.exception.ServiceException;
 import com.iotechn.unimall.data.util.ExcelUtil;
-import com.iotechn.unimall.data.mapper.unimall.PersonalHomepageInfoMapper;
-import com.iotechn.unimall.data.domain.unimall.PersonalHomepageInfo;
-import com.iotechn.unimall.admin.api.unimall.IPersonalHomepageInfoService;
+import com.iotechn.unimall.data.mapper.PersonalHomepageInfoMapper;
+import com.iotechn.unimall.data.domain.PersonalHomepageInfo;
+import com.iotechn.unimall.admin.api.card.IPersonalHomepageInfoService;
 import com.iotechn.unimall.data.model.Page;
 import java.util.Date;
 import org.springframework.transaction.annotation.Transactional;

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/SearchRecordsInfoServiceImpl.java

@@ -1,4 +1,4 @@
-package com.iotechn.unimall.admin.api.unimall;
+package com.iotechn.unimall.admin.api.card.impl;
 
 import java.util.List;
 
@@ -11,9 +11,9 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.iotechn.unimall.core.exception.ServiceException;
 import com.iotechn.unimall.data.util.ExcelUtil;
-import com.iotechn.unimall.data.mapper.unimall.SearchRecordsInfoMapper;
-import com.iotechn.unimall.data.domain.unimall.SearchRecordsInfo;
-import com.iotechn.unimall.admin.api.unimall.ISearchRecordsInfoService;
+import com.iotechn.unimall.data.mapper.SearchRecordsInfoMapper;
+import com.iotechn.unimall.data.domain.SearchRecordsInfo;
+import com.iotechn.unimall.admin.api.card.ISearchRecordsInfoService;
 import com.iotechn.unimall.data.model.Page;
 import java.util.Date;
 import org.springframework.transaction.annotation.Transactional;

unimall-app-api/src/main/java/com/iotechn/unimall/app/api/commonUser/CommonUserService.java

@@ -9,7 +9,7 @@ import com.iotechn.unimall.core.annotation.param.NotNull;
 import com.iotechn.unimall.core.annotation.param.TextFormat;
 import com.iotechn.unimall.core.exception.ServiceException;
 import com.iotechn.unimall.data.dto.UserDTO;
-import com.iotechn.unimall.data.domain.unimall.CommonUserInfo;
+import com.iotechn.unimall.data.domain.CommonUserInfo;
 
 import java.io.IOException;
 

unimall-app-api/src/main/java/com/iotechn/unimall/app/api/commonUser/CommonUserServiceImpl.java

@@ -14,7 +14,7 @@ import com.iotechn.unimall.core.util.GeneratorUtil;
 import com.iotechn.unimall.core.util.SHA1Util;
 import com.iotechn.unimall.data.component.CacheComponent;
 import com.iotechn.unimall.data.domain.UserDO;
-import com.iotechn.unimall.data.domain.unimall.CommonUserInfo;
+import com.iotechn.unimall.data.domain.CommonUserInfo;
 import com.iotechn.unimall.data.dto.UserDTO;
 import com.iotechn.unimall.data.enums.UserLoginType;
 import com.iotechn.unimall.data.mapper.UserMapper;
@@ -38,7 +38,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import com.iotechn.unimall.data.mapper.unimall.CommonUserInfoMapper;
+import com.iotechn.unimall.data.mapper.CommonUserInfoMapper;
 /**
  * Created by rize on 2019/6/30.
  */

unimall-data/src/main/java/com/iotechn/unimall/data/domain/CardClassifyInfo.java

@@ -1,4 +1,4 @@
-package com.iotechn.unimall.data.domain.unimall;
+package com.iotechn.unimall.data.domain;
 
 import com.iotechn.unimall.data.domain.SuperDO;
 import org.apache.commons.lang3.builder.ToStringBuilder;

unimall-data/src/main/java/com/iotechn/unimall/data/domain/CardHolderInfo.java

@@ -1,4 +1,4 @@
-package com.iotechn.unimall.data.domain.unimall;
+package com.iotechn.unimall.data.domain;
 
 import com.iotechn.unimall.data.domain.SuperDO;
 import org.apache.commons.lang3.builder.ToStringBuilder;

unimall-data/src/main/java/com/iotechn/unimall/data/domain/CardManagementInfo.java

@@ -1,4 +1,4 @@
-package com.iotechn.unimall.data.domain.unimall;
+package com.iotechn.unimall.data.domain;
 
 import com.iotechn.unimall.data.domain.SuperDO;
 import org.apache.commons.lang3.builder.ToStringBuilder;

unimall-data/src/main/java/com/iotechn/unimall/data/domain/CertificateManagementInfo.java

@@ -1,4 +1,4 @@
-package com.iotechn.unimall.data.domain.unimall;
+package com.iotechn.unimall.data.domain;
 
 import com.iotechn.unimall.data.domain.SuperDO;
 import org.apache.commons.lang3.builder.ToStringBuilder;

unimall-data/src/main/java/com/iotechn/unimall/data/domain/CircleCardInfo.java

@@ -1,4 +1,4 @@
-package com.iotechn.unimall.data.domain.unimall;
+package com.iotechn.unimall.data.domain;
 
 import com.iotechn.unimall.data.domain.SuperDO;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -26,13 +26,13 @@ public class CircleCardInfo extends SuperDO {
 
     /** 圈子id */
     @Excel(name = "圈子id")
-    @TableField("com_id")
-    private String comId;
+    @TableField("circle_id")
+    private String circleId;
 
     /** 名片id */
     @Excel(name = "名片id")
-    @TableField("identity_id")
-    private String identityId;
+    @TableField("card_id")
+    private String cardId;
 
     /** 个人id */
     @Excel(name = "个人id")
@@ -58,8 +58,8 @@ public class CircleCardInfo extends SuperDO {
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("comId", getComId())
-            .append("identityId", getIdentityId())
+            .append("circleId", getCircleId())
+            .append("cardId", getCardId())
             .append("commonId", getCommonId())
             .append("gmtCreate", getGmtCreate())
             .append("gmtUpdate", getGmtUpdate())

unimall-data/src/main/java/com/iotechn/unimall/data/domain/CircleManagementInfo.java

@@ -1,4 +1,4 @@
-package com.iotechn.unimall.data.domain.unimall;
+package com.iotechn.unimall.data.domain;
 
 import com.iotechn.unimall.data.domain.SuperDO;
 import org.apache.commons.lang3.builder.ToStringBuilder;

unimall-data/src/main/java/com/iotechn/unimall/data/domain/CommonUserInfo.java

@@ -1,4 +1,4 @@
-package com.iotechn.unimall.data.domain.unimall;
+package com.iotechn.unimall.data.domain;
 
 import com.iotechn.unimall.data.domain.SuperDO;
 import org.apache.commons.lang3.builder.ToStringBuilder;

unimall-data/src/main/java/com/iotechn/unimall/data/domain/PersonalHomepageInfo.java

@@ -1,4 +1,4 @@
-package com.iotechn.unimall.data.domain.unimall;
+package com.iotechn.unimall.data.domain;
 
 import com.iotechn.unimall.data.domain.SuperDO;
 import org.apache.commons.lang3.builder.ToStringBuilder;

unimall-data/src/main/java/com/iotechn/unimall/data/domain/SearchRecordsInfo.java

@@ -1,4 +1,4 @@
-package com.iotechn.unimall.data.domain.unimall;
+package com.iotechn.unimall.data.domain;
 
 import com.iotechn.unimall.data.domain.SuperDO;
 import org.apache.commons.lang3.builder.ToStringBuilder;

unimall-data/src/main/java/com/iotechn/unimall/data/mapper/CardClassifyInfoMapper.java

@@ -1,6 +1,6 @@
-package com.iotechn.unimall.data.mapper.unimall;
+package com.iotechn.unimall.data.mapper;
 
-import com.iotechn.unimall.data.domain.unimall.CardClassifyInfo;
+import com.iotechn.unimall.data.domain.CardClassifyInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 /**
  * 名片分类Mapper接口

unimall-data/src/main/java/com/iotechn/unimall/data/mapper/CardHolderInfoMapper.java

@@ -1,6 +1,6 @@
-package com.iotechn.unimall.data.mapper.unimall;
+package com.iotechn.unimall.data.mapper;
 
-import com.iotechn.unimall.data.domain.unimall.CardHolderInfo;
+import com.iotechn.unimall.data.domain.CardHolderInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 /**
  * 名片夹Mapper接口

unimall-data/src/main/java/com/iotechn/unimall/data/mapper/CardManagementInfoMapper.java

@@ -1,6 +1,6 @@
-package com.iotechn.unimall.data.mapper.unimall;
+package com.iotechn.unimall.data.mapper;
 
-import com.iotechn.unimall.data.domain.unimall.CardManagementInfo;
+import com.iotechn.unimall.data.domain.CardManagementInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 /**
  * 名片管理Mapper接口

unimall-data/src/main/java/com/iotechn/unimall/data/mapper/CertificateManagementInfoMapper.java

@@ -1,6 +1,6 @@
-package com.iotechn.unimall.data.mapper.unimall;
+package com.iotechn.unimall.data.mapper;
 
-import com.iotechn.unimall.data.domain.unimall.CertificateManagementInfo;
+import com.iotechn.unimall.data.domain.CertificateManagementInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 /**
  * 证件管理Mapper接口

unimall-data/src/main/java/com/iotechn/unimall/data/mapper/CircleCardInfoMapper.java

@@ -1,6 +1,6 @@
-package com.iotechn.unimall.data.mapper.unimall;
+package com.iotechn.unimall.data.mapper;
 
-import com.iotechn.unimall.data.domain.unimall.CircleCardInfo;
+import com.iotechn.unimall.data.domain.CircleCardInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 /**
  * 圈子个人关系Mapper接口

unimall-data/src/main/java/com/iotechn/unimall/data/mapper/CircleManagementInfoMapper.java

@@ -1,6 +1,6 @@
-package com.iotechn.unimall.data.mapper.unimall;
+package com.iotechn.unimall.data.mapper;
 
-import com.iotechn.unimall.data.domain.unimall.CircleManagementInfo;
+import com.iotechn.unimall.data.domain.CircleManagementInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 /**
  * 圈子管理Mapper接口

unimall-data/src/main/java/com/iotechn/unimall/data/mapper/CommonUserInfoMapper.java

@@ -1,6 +1,6 @@
-package com.iotechn.unimall.data.mapper.unimall;
+package com.iotechn.unimall.data.mapper;
 
-import com.iotechn.unimall.data.domain.unimall.CommonUserInfo;
+import com.iotechn.unimall.data.domain.CommonUserInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 /**
  * 用户管理Mapper接口

unimall-data/src/main/java/com/iotechn/unimall/data/mapper/PersonalHomepageInfoMapper.java

@@ -1,6 +1,6 @@
-package com.iotechn.unimall.data.mapper.unimall;
+package com.iotechn.unimall.data.mapper;
 
-import com.iotechn.unimall.data.domain.unimall.PersonalHomepageInfo;
+import com.iotechn.unimall.data.domain.PersonalHomepageInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 /**
  * 个人主页Mapper接口

unimall-data/src/main/java/com/iotechn/unimall/data/mapper/SearchRecordsInfoMapper.java

@@ -1,6 +1,6 @@
-package com.iotechn.unimall.data.mapper.unimall;
+package com.iotechn.unimall.data.mapper;
 
-import com.iotechn.unimall.data.domain.unimall.SearchRecordsInfo;
+import com.iotechn.unimall.data.domain.SearchRecordsInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 /**
  * 搜索记录Mapper接口

unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/CardClassifyInfoMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.iotechn.unimall.data.mapper.unimall.CardClassifyInfoMapper">
+<mapper namespace="com.iotechn.unimall.data.mapper.CardClassifyInfoMapper">
     
 
 

unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/CardHolderInfoMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.iotechn.unimall.data.mapper.unimall.CardHolderInfoMapper">
+<mapper namespace="com.iotechn.unimall.data.mapper.CardHolderInfoMapper">
     
 
 

unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/CardManagementInfoMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.iotechn.unimall.data.mapper.unimall.CardManagementInfoMapper">
+<mapper namespace="com.iotechn.unimall.data.mapper.CardManagementInfoMapper">
     
 
 

unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/CertificateManagementInfoMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.iotechn.unimall.data.mapper.unimall.CertificateManagementInfoMapper">
+<mapper namespace="com.iotechn.unimall.data.mapper.CertificateManagementInfoMapper">
     
 
 

unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/CircleCardInfoMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.iotechn.unimall.data.mapper.unimall.CircleCardInfoMapper">
+<mapper namespace="com.iotechn.unimall.data.mapper.CircleCardInfoMapper">
     
 
 

unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/CircleManagementInfoMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.iotechn.unimall.data.mapper.unimall.CircleManagementInfoMapper">
+<mapper namespace="com.iotechn.unimall.data.mapper.CircleManagementInfoMapper">
     
 
 

unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/CommonUserInfoMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.iotechn.unimall.data.mapper.unimall.CommonUserInfoMapper">
+<mapper namespace="com.iotechn.unimall.data.mapper.CommonUserInfoMapper">
     
 
 

unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/PersonalHomepageInfoMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.iotechn.unimall.data.mapper.unimall.PersonalHomepageInfoMapper">
+<mapper namespace="com.iotechn.unimall.data.mapper.PersonalHomepageInfoMapper">
     
 
 

unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/SearchRecordsInfoMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.iotechn.unimall.data.mapper.unimall.SearchRecordsInfoMapper">
+<mapper namespace="com.iotechn.unimall.data.mapper.SearchRecordsInfoMapper">
     
 
 

unimall-launcher/src/main/resources/application.properties

@@ -86,8 +86,8 @@ oss.aliyun.oss.basekUrl=https://taohaoliang.oss-cn-beijing.aliyuncs.com/
 ########################################################
 ### 微信 小程序、APP、H5信息
 ########################################################
-com.iotechn.unimall.wx.mini.app-id=wxa03b5fb231b72b08
-com.iotechn.unimall.wx.mini.app-secret=c6c220553a737cc4d626ebd4ff245c5e
+com.iotechn.unimall.wx.mini.app-id=wx4505a6ea6f703e17
+com.iotechn.unimall.wx.mini.app-secret=a707ec774f069a020257317803b656ce
 
 com.iotechn.unimall.wx.app.app-id=wxe3c17ca92931512d
 com.iotechn.unimall.wx.app.app-secret=049151cd78f6671a27704be472832ff1

xiaochengxu/pages/mySet/myCard.vue

@@ -52,7 +52,7 @@
 			return {
 				show:false,
 				modalshow:false,
-				columns:['选择名片','识别身份证号','识别1银行卡号']
+				columns:['选择名片111','识别身份证号','识别1银行卡号']
 			};
 		},
 		methods: {

xiaochengxu/pages/mySet/myHome.vue

@@ -60,7 +60,7 @@
 		},
 		methods: {
 			edit(){
-				
+				11
 				// uni.showLoading({
 				// 	title: '数据加载中'
 				// })