Mrking
|
2cfd3db67a
|
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
# Conflicts:
# hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/ErrorCodeConstants.java
# hangtag-module-system/hangtag-module-system-biz/target/generated-sources/annotations/cn/hangtag/module/system/convert/oauth2/OAuth2OpenConvertImpl.java
# hangtag-module-system/hangtag-module-system-biz/target/generated-sources/annotations/cn/hangtag/module/system/convert/social/SocialUserConvertImpl.java
|
2024-09-01 18:39:16 +08:00 |
YuanFeng
|
250a06e19d
|
fix dialog组件文件
|
2024-09-01 15:51:14 +08:00 |
|
YuanFeng
|
a2231b68de
|
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
# Conflicts:
# hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/ErrorCodeConstants.java
# hangtag-ui/hangtag-ui-front/src/components/DraftDesign/components/DesignPreviewDialog.vue
# hangtag-ui/hangtag-ui-front/src/components/DraftDesign/components/DesignPropEdit.vue
|
2024-09-01 15:20:38 +08:00 |
|
Mrking
|
1c9bca7345
|
新增品牌关系表
|
2024-08-30 08:13:57 +08:00 |
|
Mrking
|
320e76dad4
|
销售订单
|
2024-08-25 18:15:14 +08:00 |