diff --git a/hangtag-framework/hangtag-spring-boot-starter-biz-data-permission/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/hangtag-framework/hangtag-spring-boot-starter-biz-data-permission/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index e7884cd..0000000
--- a/hangtag-framework/hangtag-spring-boot-starter-biz-data-permission/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1,2 +0,0 @@
-cn.hangtag.framework.datapermission.config.HangtagDataPermissionAutoConfiguration
-cn.hangtag.framework.datapermission.config.HangtagDeptDataPermissionAutoConfiguration
\ No newline at end of file
diff --git a/hangtag-framework/hangtag-spring-boot-starter-biz-ip/target/classes/area.csv b/hangtag-framework/hangtag-spring-boot-starter-biz-ip/target/classes/area.csv
deleted file mode 100644
index 06954ba..0000000
--- a/hangtag-framework/hangtag-spring-boot-starter-biz-ip/target/classes/area.csv
+++ /dev/null
@@ -1,3662 +0,0 @@
-id,name,type,parentId
-1,中国,1,0
-2,蒙古,1,0
-3,朝鲜,1,0
-4,韩国,1,0
-5,日本,1,0
-6,菲律宾,1,0
-7,越南,1,0
-8,老挝,1,0
-9,柬埔寨,1,0
-10,缅甸,1,0
-11,泰国,1,0
-12,马来西亚,1,0
-13,文莱,1,0
-14,新加坡,1,0
-15,印度尼西亚,1,0
-16,东帝汶,1,0
-17,尼泊尔,1,0
-18,不丹,1,0
-19,孟加拉国,1,0
-20,印度,1,0
-21,巴基斯坦,1,0
-22,斯里兰卡,1,0
-23,马尔代夫,1,0
-24,哈萨克斯坦,1,0
-25,吉尔吉斯斯坦,1,0
-26,塔吉克斯坦,1,0
-27,乌兹别克斯坦,1,0
-28,土库曼斯坦,1,0
-29,阿富汗,1,0
-30,伊拉克,1,0
-31,伊朗,1,0
-32,叙利亚,1,0
-33,约旦,1,0
-34,黎巴嫩,1,0
-35,以色列,1,0
-36,巴勒斯坦,1,0
-37,沙特阿拉伯,1,0
-38,巴林,1,0
-39,卡塔尔,1,0
-40,科威特,1,0
-41,阿拉伯联合酋长国,1,0
-42,阿曼,1,0
-43,也门,1,0
-44,格鲁吉亚,1,0
-45,亚美尼亚,1,0
-46,阿塞拜疆,1,0
-47,土耳其,1,0
-48,塞浦路斯,1,0
-49,芬兰,1,0
-50,瑞典,1,0
-51,挪威,1,0
-52,冰岛,1,0
-53,丹麦,1,0
-54,爱沙尼亚,1,0
-55,拉脱维亚,1,0
-56,立陶宛,1,0
-57,白俄罗斯,1,0
-58,俄罗斯,1,0
-59,乌克兰,1,0
-60,摩尔多瓦,1,0
-61,波兰,1,0
-62,捷克,1,0
-63,斯洛伐克,1,0
-64,匈牙利,1,0
-65,德国,1,0
-66,奥地利,1,0
-67,瑞士,1,0
-68,列支敦士登,1,0
-69,英国,1,0
-70,爱尔兰,1,0
-71,荷兰,1,0
-72,比利时,1,0
-73,卢森堡,1,0
-74,法国,1,0
-75,摩纳哥,1,0
-76,罗马尼亚,1,0
-77,保加利亚,1,0
-78,塞尔维亚,1,0
-79,马其顿,1,0
-80,阿尔巴尼亚,1,0
-81,希腊,1,0
-82,斯洛文尼亚,1,0
-83,克罗地亚,1,0
-84,波斯尼亚和墨塞哥维那,1,0
-85,意大利,1,0
-86,梵蒂冈,1,0
-87,圣马力诺,1,0
-88,马耳他,1,0
-89,西班牙,1,0
-90,葡萄牙,1,0
-91,安道尔共和国,1,0
-92,埃及,1,0
-93,利比亚,1,0
-94,苏丹,1,0
-95,突尼斯,1,0
-96,阿尔及利亚,1,0
-97,摩洛哥,1,0
-98,亚速尔群岛,1,0
-99,马德拉群岛,1,0
-100,埃塞俄比亚,1,0
-101,厄立特里亚,1,0
-102,索马里,1,0
-103,吉布提,1,0
-104,肯尼亚,1,0
-105,坦桑尼亚,1,0
-106,乌干达,1,0
-107,卢旺达,1,0
-108,布隆迪,1,0
-109,塞舌尔,1,0
-110,圣多美及普林西比,1,0
-111,塞内加尔,1,0
-112,冈比亚,1,0
-113,马里,1,0
-114,布基纳法索,1,0
-115,几内亚,1,0
-116,几内亚比绍,1,0
-117,佛得角,1,0
-118,塞拉利昂,1,0
-119,利比里亚,1,0
-120,科特迪瓦,1,0
-121,加纳,1,0
-122,多哥,1,0
-123,贝宁,1,0
-124,尼日尔,1,0
-125,加那利群岛,1,0
-126,赞比亚,1,0
-127,安哥拉,1,0
-128,津巴布韦,1,0
-129,马拉维,1,0
-130,莫桑比克,1,0
-131,博茨瓦纳,1,0
-132,纳米比亚,1,0
-133,南非,1,0
-134,斯威士兰,1,0
-135,莱索托,1,0
-136,马达加斯加,1,0
-137,科摩罗,1,0
-138,毛里求斯,1,0
-139,留尼旺,1,0
-140,圣赫勒拿,1,0
-141,澳大利亚,1,0
-142,新西兰,1,0
-143,巴布亚新几内亚,1,0
-144,所罗门群岛,1,0
-145,瓦努阿图共和国,1,0
-146,密克罗尼西亚,1,0
-147,马绍尔群岛,1,0
-148,帕劳,1,0
-149,瑙鲁,1,0
-150,基里巴斯,1,0
-151,图瓦卢,1,0
-152,萨摩亚,1,0
-153,斐济,1,0
-154,汤加,1,0
-155,库克群岛,1,0
-156,关岛,1,0
-157,新喀里多尼亚,1,0
-158,法属波利尼西亚,1,0
-159,皮特凯恩岛,1,0
-160,瓦利斯与富图纳,1,0
-161,纽埃,1,0
-162,托克劳,1,0
-163,美属萨摩亚,1,0
-164,北马里亚纳,1,0
-165,加拿大,1,0
-166,美国,1,0
-167,墨西哥,1,0
-168,格陵兰,1,0
-169,危地马拉,1,0
-170,伯利兹,1,0
-171,萨尔瓦多,1,0
-172,洪都拉斯,1,0
-173,尼加拉瓜,1,0
-174,哥斯达黎加,1,0
-175,巴拿马,1,0
-176,巴哈马,1,0
-177,古巴,1,0
-178,牙买加,1,0
-179,海地,1,0
-180,多米尼加共和国,1,0
-181,安提瓜和巴布达,1,0
-182,圣基茨和尼维斯,1,0
-183,多米尼克,1,0
-184,圣卢西亚,1,0
-185,圣文森特和格林纳丁斯,1,0
-186,格林纳达,1,0
-187,巴巴多斯,1,0
-188,特立尼达和多巴哥,1,0
-189,波多黎各,1,0
-190,英属维尔京群岛,1,0
-191,美属维尔京群岛,1,0
-192,安圭拉,1,0
-193,蒙特塞拉特岛,1,0
-194,瓜德罗普,1,0
-195,马提尼克,1,0
-196,荷属安的列斯,1,0
-197,阿鲁巴,1,0
-198,特克斯和凯科斯群岛,1,0
-199,开曼群岛,1,0
-200,百慕大,1,0
-201,哥伦比亚,1,0
-202,委内瑞拉,1,0
-203,圭亚那,1,0
-204,法属圭亚那,1,0
-205,苏里南,1,0
-206,厄瓜多尔,1,0
-207,秘鲁,1,0
-208,玻利维亚,1,0
-209,巴西,1,0
-210,智利,1,0
-211,阿根廷,1,0
-212,乌拉圭,1,0
-213,巴拉圭,1,0
-214,波黑,1,0
-215,直布罗陀,1,0
-216,新喀里多尼亚群岛,1,0
-217,瓦利斯和富图纳群岛,1,0
-218,泽西岛,1,0
-219,黑山,1,0
-220,英属马恩岛,1,0
-221,尼日利亚,1,0
-222,喀麦隆,1,0
-223,加蓬,1,0
-224,乍得,1,0
-225,刚果共和国,1,0
-226,中非共和国,1,0
-227,南苏丹,1,0
-228,赤道几内亚,1,0
-229,毛里塔尼亚,1,0
-230,刚果民主共和国,1,0
-231,留尼汪岛,1,0
-232,格陵兰岛,1,0
-233,法罗群岛,1,0
-234,根西岛,1,0
-235,百慕大群岛,1,0
-236,圣皮埃尔和密克隆群岛,1,0
-237,法属圣马丁,1,0
-238,奥兰群岛,1,0
-239,北马里亚纳群岛,1,0
-240,库拉索,1,0
-241,博内尔岛,1,0
-242,圣马丁岛,1,0
-243,圣巴泰勒米岛,1,0
-244,福克兰群岛,1,0
-245,圣多美和普林西比,1,0
-246,英属印度洋领地,1,0
-247,东萨摩亚,1,0
-248,诺福克岛,1,0
-110000,北京,2,1
-120000,天津,2,1
-130000,河北省,2,1
-140000,山西省,2,1
-150000,内蒙古自治区,2,1
-210000,辽宁省,2,1
-220000,吉林省,2,1
-230000,黑龙江省,2,1
-310000,上海,2,1
-320000,江苏省,2,1
-330000,浙江省,2,1
-340000,安徽省,2,1
-350000,福建省,2,1
-360000,江西省,2,1
-370000,山东省,2,1
-410000,河南省,2,1
-420000,湖北省,2,1
-430000,湖南省,2,1
-440000,广东省,2,1
-450000,广西壮族自治区,2,1
-460000,海南省,2,1
-500000,重庆,2,1
-510000,四川省,2,1
-520000,贵州省,2,1
-530000,云南省,2,1
-540000,西藏自治区,2,1
-610000,陕西省,2,1
-620000,甘肃省,2,1
-630000,青海省,2,1
-640000,宁夏回族自治区,2,1
-650000,新疆维吾尔自治区,2,1
-110100,北京市,3,110000
-120100,天津市,3,120000
-130100,石家庄市,3,130000
-130200,唐山市,3,130000
-130300,秦皇岛市,3,130000
-130400,邯郸市,3,130000
-130500,邢台市,3,130000
-130600,保定市,3,130000
-130700,张家口市,3,130000
-130800,承德市,3,130000
-130900,沧州市,3,130000
-131000,廊坊市,3,130000
-131100,衡水市,3,130000
-140100,太原市,3,140000
-140200,大同市,3,140000
-140300,阳泉市,3,140000
-140400,长治市,3,140000
-140500,晋城市,3,140000
-140600,朔州市,3,140000
-140700,晋中市,3,140000
-140800,运城市,3,140000
-140900,忻州市,3,140000
-141000,临汾市,3,140000
-141100,吕梁市,3,140000
-150100,呼和浩特市,3,150000
-150200,包头市,3,150000
-150300,乌海市,3,150000
-150400,赤峰市,3,150000
-150500,通辽市,3,150000
-150600,鄂尔多斯市,3,150000
-150700,呼伦贝尔市,3,150000
-150800,巴彦淖尔市,3,150000
-150900,乌兰察布市,3,150000
-152200,兴安盟,3,150000
-152500,锡林郭勒盟,3,150000
-152900,阿拉善盟,3,150000
-210100,沈阳市,3,210000
-210200,大连市,3,210000
-210300,鞍山市,3,210000
-210400,抚顺市,3,210000
-210500,本溪市,3,210000
-210600,丹东市,3,210000
-210700,锦州市,3,210000
-210800,营口市,3,210000
-210900,阜新市,3,210000
-211000,辽阳市,3,210000
-211100,盘锦市,3,210000
-211200,铁岭市,3,210000
-211300,朝阳市,3,210000
-211400,葫芦岛市,3,210000
-220100,长春市,3,220000
-220200,吉林市,3,220000
-220300,四平市,3,220000
-220400,辽源市,3,220000
-220500,通化市,3,220000
-220600,白山市,3,220000
-220700,松原市,3,220000
-220800,白城市,3,220000
-222400,延边朝鲜族自治州,3,220000
-230100,哈尔滨市,3,230000
-230200,齐齐哈尔市,3,230000
-230300,鸡西市,3,230000
-230400,鹤岗市,3,230000
-230500,双鸭山市,3,230000
-230600,大庆市,3,230000
-230700,伊春市,3,230000
-230800,佳木斯市,3,230000
-230900,七台河市,3,230000
-231000,牡丹江市,3,230000
-231100,黑河市,3,230000
-231200,绥化市,3,230000
-232700,大兴安岭地区,3,230000
-310100,上海市,3,310000
-320100,南京市,3,320000
-320200,无锡市,3,320000
-320300,徐州市,3,320000
-320400,常州市,3,320000
-320500,苏州市,3,320000
-320600,南通市,3,320000
-320700,连云港市,3,320000
-320800,淮安市,3,320000
-320900,盐城市,3,320000
-321000,扬州市,3,320000
-321100,镇江市,3,320000
-321200,泰州市,3,320000
-321300,宿迁市,3,320000
-330100,杭州市,3,330000
-330200,宁波市,3,330000
-330300,温州市,3,330000
-330400,嘉兴市,3,330000
-330500,湖州市,3,330000
-330600,绍兴市,3,330000
-330700,金华市,3,330000
-330800,衢州市,3,330000
-330900,舟山市,3,330000
-331000,台州市,3,330000
-331100,丽水市,3,330000
-340100,合肥市,3,340000
-340200,芜湖市,3,340000
-340300,蚌埠市,3,340000
-340400,淮南市,3,340000
-340500,马鞍山市,3,340000
-340600,淮北市,3,340000
-340700,铜陵市,3,340000
-340800,安庆市,3,340000
-341000,黄山市,3,340000
-341100,滁州市,3,340000
-341200,阜阳市,3,340000
-341300,宿州市,3,340000
-341500,六安市,3,340000
-341600,亳州市,3,340000
-341700,池州市,3,340000
-341800,宣城市,3,340000
-350100,福州市,3,350000
-350200,厦门市,3,350000
-350300,莆田市,3,350000
-350400,三明市,3,350000
-350500,泉州市,3,350000
-350600,漳州市,3,350000
-350700,南平市,3,350000
-350800,龙岩市,3,350000
-350900,宁德市,3,350000
-360100,南昌市,3,360000
-360200,景德镇市,3,360000
-360300,萍乡市,3,360000
-360400,九江市,3,360000
-360500,新余市,3,360000
-360600,鹰潭市,3,360000
-360700,赣州市,3,360000
-360800,吉安市,3,360000
-360900,宜春市,3,360000
-361000,抚州市,3,360000
-361100,上饶市,3,360000
-370100,济南市,3,370000
-370200,青岛市,3,370000
-370300,淄博市,3,370000
-370400,枣庄市,3,370000
-370500,东营市,3,370000
-370600,烟台市,3,370000
-370700,潍坊市,3,370000
-370800,济宁市,3,370000
-370900,泰安市,3,370000
-371000,威海市,3,370000
-371100,日照市,3,370000
-371300,临沂市,3,370000
-371400,德州市,3,370000
-371500,聊城市,3,370000
-371600,滨州市,3,370000
-371700,菏泽市,3,370000
-410100,郑州市,3,410000
-410200,开封市,3,410000
-410300,洛阳市,3,410000
-410400,平顶山市,3,410000
-410500,安阳市,3,410000
-410600,鹤壁市,3,410000
-410700,新乡市,3,410000
-410800,焦作市,3,410000
-410900,濮阳市,3,410000
-411000,许昌市,3,410000
-411100,漯河市,3,410000
-411200,三门峡市,3,410000
-411300,南阳市,3,410000
-411400,商丘市,3,410000
-411500,信阳市,3,410000
-411600,周口市,3,410000
-411700,驻马店市,3,410000
-419000,省直辖县级行政区划,3,410000
-420100,武汉市,3,420000
-420200,黄石市,3,420000
-420300,十堰市,3,420000
-420500,宜昌市,3,420000
-420600,襄阳市,3,420000
-420700,鄂州市,3,420000
-420800,荆门市,3,420000
-420900,孝感市,3,420000
-421000,荆州市,3,420000
-421100,黄冈市,3,420000
-421200,咸宁市,3,420000
-421300,随州市,3,420000
-422800,恩施土家族苗族自治州,3,420000
-429000,省直辖县级行政区划,3,420000
-430100,长沙市,3,430000
-430200,株洲市,3,430000
-430300,湘潭市,3,430000
-430400,衡阳市,3,430000
-430500,邵阳市,3,430000
-430600,岳阳市,3,430000
-430700,常德市,3,430000
-430800,张家界市,3,430000
-430900,益阳市,3,430000
-431000,郴州市,3,430000
-431100,永州市,3,430000
-431200,怀化市,3,430000
-431300,娄底市,3,430000
-433100,湘西土家族苗族自治州,3,430000
-440100,广州市,3,440000
-440200,韶关市,3,440000
-440300,深圳市,3,440000
-440400,珠海市,3,440000
-440500,汕头市,3,440000
-440600,佛山市,3,440000
-440700,江门市,3,440000
-440800,湛江市,3,440000
-440900,茂名市,3,440000
-441200,肇庆市,3,440000
-441300,惠州市,3,440000
-441400,梅州市,3,440000
-441500,汕尾市,3,440000
-441600,河源市,3,440000
-441700,阳江市,3,440000
-441800,清远市,3,440000
-441900,东莞市,3,440000
-441901,莞城区,4,441900
-441902,南城区,4,441900
-441904,万江区,4,441900
-441905,石碣镇,4,441900
-441906,石龙镇,4,441900
-441907,茶山镇,4,441900
-441908,石排镇,4,441900
-441909,企石镇,4,441900
-441910,横沥镇,4,441900
-441911,桥头镇,4,441900
-441912,谢岗镇,4,441900
-441913,东坑镇,4,441900
-441914,常平镇,4,441900
-441915,寮步镇,4,441900
-441916,大朗镇,4,441900
-441917,麻涌镇,4,441900
-441918,中堂镇,4,441900
-441919,高埗镇,4,441900
-441920,樟木头镇,4,441900
-441921,大岭山镇,4,441900
-441922,望牛墩镇,4,441900
-441923,黄江镇,4,441900
-441924,洪梅镇,4,441900
-441925,清溪镇,4,441900
-441926,沙田镇,4,441900
-441927,道滘镇,4,441900
-441928,塘厦镇,4,441900
-441929,虎门镇,4,441900
-441930,厚街镇,4,441900
-441931,凤岗镇,4,441900
-441932,长安镇,4,441900
-442000,中山市,3,440000
-442001,石岐街道,4,442000
-442002,东区街道,4,442000
-442003,中山港街道,4,442000
-442004,西区街道,4,442000
-442005,南区街道,4,442000
-442006,五桂山街道,4,442000
-442007,民众街道,4,442000
-442008,南朗街道,4,442000
-442009,黄圃镇,4,442000
-442010,东凤镇,4,442000
-442011,古镇镇,4,442000
-442012,沙溪镇,4,442000
-442013,坦洲镇,4,442000
-442014,港口镇,4,442000
-442015,三角镇,4,442000
-442016,横栏镇,4,442000
-442017,南头镇,4,442000
-442018,阜沙镇,4,442000
-442019,三乡镇,4,442000
-442020,板芙镇,4,442000
-442021,大涌镇,4,442000
-442022,神湾镇,4,442000
-442023,小榄镇,4,442000
-445100,潮州市,3,440000
-445200,揭阳市,3,440000
-445300,云浮市,3,440000
-450100,南宁市,3,450000
-450200,柳州市,3,450000
-450300,桂林市,3,450000
-450400,梧州市,3,450000
-450500,北海市,3,450000
-450600,防城港市,3,450000
-450700,钦州市,3,450000
-450800,贵港市,3,450000
-450900,玉林市,3,450000
-451000,百色市,3,450000
-451100,贺州市,3,450000
-451200,河池市,3,450000
-451300,来宾市,3,450000
-451400,崇左市,3,450000
-460100,海口市,3,460000
-460200,三亚市,3,460000
-460300,三沙市,3,460000
-460400,儋州市,3,460000
-469000,省直辖县级行政区划,3,460000
-500100,重庆市,3,500000
-510100,成都市,3,510000
-510300,自贡市,3,510000
-510400,攀枝花市,3,510000
-510500,泸州市,3,510000
-510600,德阳市,3,510000
-510700,绵阳市,3,510000
-510800,广元市,3,510000
-510900,遂宁市,3,510000
-511000,内江市,3,510000
-511100,乐山市,3,510000
-511300,南充市,3,510000
-511400,眉山市,3,510000
-511500,宜宾市,3,510000
-511600,广安市,3,510000
-511700,达州市,3,510000
-511800,雅安市,3,510000
-511900,巴中市,3,510000
-512000,资阳市,3,510000
-513200,阿坝藏族羌族自治州,3,510000
-513300,甘孜藏族自治州,3,510000
-513400,凉山彝族自治州,3,510000
-520100,贵阳市,3,520000
-520200,六盘水市,3,520000
-520300,遵义市,3,520000
-520400,安顺市,3,520000
-520500,毕节市,3,520000
-520600,铜仁市,3,520000
-522300,黔西南布依族苗族自治州,3,520000
-522600,黔东南苗族侗族自治州,3,520000
-522700,黔南布依族苗族自治州,3,520000
-530100,昆明市,3,530000
-530300,曲靖市,3,530000
-530400,玉溪市,3,530000
-530500,保山市,3,530000
-530600,昭通市,3,530000
-530700,丽江市,3,530000
-530800,普洱市,3,530000
-530900,临沧市,3,530000
-532300,楚雄彝族自治州,3,530000
-532500,红河哈尼族彝族自治州,3,530000
-532600,文山壮族苗族自治州,3,530000
-532800,西双版纳傣族自治州,3,530000
-532900,大理白族自治州,3,530000
-533100,德宏傣族景颇族自治州,3,530000
-533300,怒江傈僳族自治州,3,530000
-533400,迪庆藏族自治州,3,530000
-540100,拉萨市,3,540000
-540200,日喀则市,3,540000
-540300,昌都市,3,540000
-540400,林芝市,3,540000
-540500,山南市,3,540000
-540600,那曲市,3,540000
-542500,阿里地区,3,540000
-610100,西安市,3,610000
-610200,铜川市,3,610000
-610300,宝鸡市,3,610000
-610400,咸阳市,3,610000
-610500,渭南市,3,610000
-610600,延安市,3,610000
-610700,汉中市,3,610000
-610800,榆林市,3,610000
-610900,安康市,3,610000
-611000,商洛市,3,610000
-620100,兰州市,3,620000
-620200,嘉峪关市,3,620000
-620300,金昌市,3,620000
-620400,白银市,3,620000
-620500,天水市,3,620000
-620600,武威市,3,620000
-620700,张掖市,3,620000
-620800,平凉市,3,620000
-620900,酒泉市,3,620000
-621000,庆阳市,3,620000
-621100,定西市,3,620000
-621200,陇南市,3,620000
-622900,临夏回族自治州,3,620000
-623000,甘南藏族自治州,3,620000
-630100,西宁市,3,630000
-630200,海东市,3,630000
-632200,海北藏族自治州,3,630000
-632300,黄南藏族自治州,3,630000
-632500,海南藏族自治州,3,630000
-632600,果洛藏族自治州,3,630000
-632700,玉树藏族自治州,3,630000
-632800,海西蒙古族藏族自治州,3,630000
-640100,银川市,3,640000
-640200,石嘴山市,3,640000
-640300,吴忠市,3,640000
-640400,固原市,3,640000
-640500,中卫市,3,640000
-650100,乌鲁木齐市,3,650000
-650200,克拉玛依市,3,650000
-650400,吐鲁番市,3,650000
-650500,哈密市,3,650000
-652300,昌吉回族自治州,3,650000
-652700,博尔塔拉蒙古自治州,3,650000
-652800,巴音郭楞蒙古自治州,3,650000
-652900,阿克苏地区,3,650000
-653000,克孜勒苏柯尔克孜自治州,3,650000
-653100,喀什地区,3,650000
-653200,和田地区,3,650000
-654000,伊犁哈萨克自治州,3,650000
-654200,塔城地区,3,650000
-654300,阿勒泰地区,3,650000
-659000,自治区直辖县级行政区划,3,650000
-110101,东城区,4,110100
-110102,西城区,4,110100
-110105,朝阳区,4,110100
-110106,丰台区,4,110100
-110107,石景山区,4,110100
-110108,海淀区,4,110100
-110109,门头沟区,4,110100
-110111,房山区,4,110100
-110112,通州区,4,110100
-110113,顺义区,4,110100
-110114,昌平区,4,110100
-110115,大兴区,4,110100
-110116,怀柔区,4,110100
-110117,平谷区,4,110100
-110118,密云区,4,110100
-110119,延庆区,4,110100
-120101,和平区,4,120100
-120102,河东区,4,120100
-120103,河西区,4,120100
-120104,南开区,4,120100
-120105,河北区,4,120100
-120106,红桥区,4,120100
-120110,东丽区,4,120100
-120111,西青区,4,120100
-120112,津南区,4,120100
-120113,北辰区,4,120100
-120114,武清区,4,120100
-120115,宝坻区,4,120100
-120116,滨海新区,4,120100
-120117,宁河区,4,120100
-120118,静海区,4,120100
-120119,蓟州区,4,120100
-130102,长安区,4,130100
-130104,桥西区,4,130100
-130105,新华区,4,130100
-130107,井陉矿区,4,130100
-130108,裕华区,4,130100
-130109,藁城区,4,130100
-130110,鹿泉区,4,130100
-130111,栾城区,4,130100
-130121,井陉县,4,130100
-130123,正定县,4,130100
-130125,行唐县,4,130100
-130126,灵寿县,4,130100
-130127,高邑县,4,130100
-130128,深泽县,4,130100
-130129,赞皇县,4,130100
-130130,无极县,4,130100
-130131,平山县,4,130100
-130132,元氏县,4,130100
-130133,赵县,4,130100
-130171,石家庄高新技术产业开发区,4,130100
-130172,石家庄循环化工园区,4,130100
-130181,辛集市,4,130100
-130183,晋州市,4,130100
-130184,新乐市,4,130100
-130202,路南区,4,130200
-130203,路北区,4,130200
-130204,古冶区,4,130200
-130205,开平区,4,130200
-130207,丰南区,4,130200
-130208,丰润区,4,130200
-130209,曹妃甸区,4,130200
-130224,滦南县,4,130200
-130225,乐亭县,4,130200
-130227,迁西县,4,130200
-130229,玉田县,4,130200
-130271,河北唐山芦台经济开发区,4,130200
-130272,唐山市汉沽管理区,4,130200
-130273,唐山高新技术产业开发区,4,130200
-130274,河北唐山海港经济开发区,4,130200
-130281,遵化市,4,130200
-130283,迁安市,4,130200
-130284,滦州市,4,130200
-130302,海港区,4,130300
-130303,山海关区,4,130300
-130304,北戴河区,4,130300
-130306,抚宁区,4,130300
-130321,青龙满族自治县,4,130300
-130322,昌黎县,4,130300
-130324,卢龙县,4,130300
-130371,秦皇岛市经济技术开发区,4,130300
-130372,北戴河新区,4,130300
-130402,邯山区,4,130400
-130403,丛台区,4,130400
-130404,复兴区,4,130400
-130406,峰峰矿区,4,130400
-130407,肥乡区,4,130400
-130408,永年区,4,130400
-130423,临漳县,4,130400
-130424,成安县,4,130400
-130425,大名县,4,130400
-130426,涉县,4,130400
-130427,磁县,4,130400
-130430,邱县,4,130400
-130431,鸡泽县,4,130400
-130432,广平县,4,130400
-130433,馆陶县,4,130400
-130434,魏县,4,130400
-130435,曲周县,4,130400
-130471,邯郸经济技术开发区,4,130400
-130473,邯郸冀南新区,4,130400
-130481,武安市,4,130400
-130502,襄都区,4,130500
-130503,信都区,4,130500
-130505,任泽区,4,130500
-130506,南和区,4,130500
-130522,临城县,4,130500
-130523,内丘县,4,130500
-130524,柏乡县,4,130500
-130525,隆尧县,4,130500
-130528,宁晋县,4,130500
-130529,巨鹿县,4,130500
-130530,新河县,4,130500
-130531,广宗县,4,130500
-130532,平乡县,4,130500
-130533,威县,4,130500
-130534,清河县,4,130500
-130535,临西县,4,130500
-130571,河北邢台经济开发区,4,130500
-130581,南宫市,4,130500
-130582,沙河市,4,130500
-130602,竞秀区,4,130600
-130606,莲池区,4,130600
-130607,满城区,4,130600
-130608,清苑区,4,130600
-130609,徐水区,4,130600
-130623,涞水县,4,130600
-130624,阜平县,4,130600
-130626,定兴县,4,130600
-130627,唐县,4,130600
-130628,高阳县,4,130600
-130629,容城县,4,130600
-130630,涞源县,4,130600
-130631,望都县,4,130600
-130632,安新县,4,130600
-130633,易县,4,130600
-130634,曲阳县,4,130600
-130635,蠡县,4,130600
-130636,顺平县,4,130600
-130637,博野县,4,130600
-130638,雄县,4,130600
-130671,保定高新技术产业开发区,4,130600
-130672,保定白沟新城,4,130600
-130681,涿州市,4,130600
-130682,定州市,4,130600
-130683,安国市,4,130600
-130684,高碑店市,4,130600
-130702,桥东区,4,130700
-130703,桥西区,4,130700
-130705,宣化区,4,130700
-130706,下花园区,4,130700
-130708,万全区,4,130700
-130709,崇礼区,4,130700
-130722,张北县,4,130700
-130723,康保县,4,130700
-130724,沽源县,4,130700
-130725,尚义县,4,130700
-130726,蔚县,4,130700
-130727,阳原县,4,130700
-130728,怀安县,4,130700
-130730,怀来县,4,130700
-130731,涿鹿县,4,130700
-130732,赤城县,4,130700
-130771,张家口经济开发区,4,130700
-130772,张家口市察北管理区,4,130700
-130773,张家口市塞北管理区,4,130700
-130802,双桥区,4,130800
-130803,双滦区,4,130800
-130804,鹰手营子矿区,4,130800
-130821,承德县,4,130800
-130822,兴隆县,4,130800
-130824,滦平县,4,130800
-130825,隆化县,4,130800
-130826,丰宁满族自治县,4,130800
-130827,宽城满族自治县,4,130800
-130828,围场满族蒙古族自治县,4,130800
-130871,承德高新技术产业开发区,4,130800
-130881,平泉市,4,130800
-130902,新华区,4,130900
-130903,运河区,4,130900
-130921,沧县,4,130900
-130922,青县,4,130900
-130923,东光县,4,130900
-130924,海兴县,4,130900
-130925,盐山县,4,130900
-130926,肃宁县,4,130900
-130927,南皮县,4,130900
-130928,吴桥县,4,130900
-130929,献县,4,130900
-130930,孟村回族自治县,4,130900
-130971,河北沧州经济开发区,4,130900
-130972,沧州高新技术产业开发区,4,130900
-130973,沧州渤海新区,4,130900
-130981,泊头市,4,130900
-130982,任丘市,4,130900
-130983,黄骅市,4,130900
-130984,河间市,4,130900
-131002,安次区,4,131000
-131003,广阳区,4,131000
-131022,固安县,4,131000
-131023,永清县,4,131000
-131024,香河县,4,131000
-131025,大城县,4,131000
-131026,文安县,4,131000
-131028,大厂回族自治县,4,131000
-131071,廊坊经济技术开发区,4,131000
-131081,霸州市,4,131000
-131082,三河市,4,131000
-131102,桃城区,4,131100
-131103,冀州区,4,131100
-131121,枣强县,4,131100
-131122,武邑县,4,131100
-131123,武强县,4,131100
-131124,饶阳县,4,131100
-131125,安平县,4,131100
-131126,故城县,4,131100
-131127,景县,4,131100
-131128,阜城县,4,131100
-131171,河北衡水高新技术产业开发区,4,131100
-131172,衡水滨湖新区,4,131100
-131182,深州市,4,131100
-140105,小店区,4,140100
-140106,迎泽区,4,140100
-140107,杏花岭区,4,140100
-140108,尖草坪区,4,140100
-140109,万柏林区,4,140100
-140110,晋源区,4,140100
-140121,清徐县,4,140100
-140122,阳曲县,4,140100
-140123,娄烦县,4,140100
-140171,山西转型综合改革示范区,4,140100
-140181,古交市,4,140100
-140212,新荣区,4,140200
-140213,平城区,4,140200
-140214,云冈区,4,140200
-140215,云州区,4,140200
-140221,阳高县,4,140200
-140222,天镇县,4,140200
-140223,广灵县,4,140200
-140224,灵丘县,4,140200
-140225,浑源县,4,140200
-140226,左云县,4,140200
-140271,山西大同经济开发区,4,140200
-140302,城区,4,140300
-140303,矿区,4,140300
-140311,郊区,4,140300
-140321,平定县,4,140300
-140322,盂县,4,140300
-140403,潞州区,4,140400
-140404,上党区,4,140400
-140405,屯留区,4,140400
-140406,潞城区,4,140400
-140423,襄垣县,4,140400
-140425,平顺县,4,140400
-140426,黎城县,4,140400
-140427,壶关县,4,140400
-140428,长子县,4,140400
-140429,武乡县,4,140400
-140430,沁县,4,140400
-140431,沁源县,4,140400
-140471,山西长治高新技术产业园区,4,140400
-140502,城区,4,140500
-140521,沁水县,4,140500
-140522,阳城县,4,140500
-140524,陵川县,4,140500
-140525,泽州县,4,140500
-140581,高平市,4,140500
-140602,朔城区,4,140600
-140603,平鲁区,4,140600
-140621,山阴县,4,140600
-140622,应县,4,140600
-140623,右玉县,4,140600
-140671,山西朔州经济开发区,4,140600
-140681,怀仁市,4,140600
-140702,榆次区,4,140700
-140703,太谷区,4,140700
-140721,榆社县,4,140700
-140722,左权县,4,140700
-140723,和顺县,4,140700
-140724,昔阳县,4,140700
-140725,寿阳县,4,140700
-140727,祁县,4,140700
-140728,平遥县,4,140700
-140729,灵石县,4,140700
-140781,介休市,4,140700
-140802,盐湖区,4,140800
-140821,临猗县,4,140800
-140822,万荣县,4,140800
-140823,闻喜县,4,140800
-140824,稷山县,4,140800
-140825,新绛县,4,140800
-140826,绛县,4,140800
-140827,垣曲县,4,140800
-140828,夏县,4,140800
-140829,平陆县,4,140800
-140830,芮城县,4,140800
-140881,永济市,4,140800
-140882,河津市,4,140800
-140902,忻府区,4,140900
-140921,定襄县,4,140900
-140922,五台县,4,140900
-140923,代县,4,140900
-140924,繁峙县,4,140900
-140925,宁武县,4,140900
-140926,静乐县,4,140900
-140927,神池县,4,140900
-140928,五寨县,4,140900
-140929,岢岚县,4,140900
-140930,河曲县,4,140900
-140931,保德县,4,140900
-140932,偏关县,4,140900
-140971,五台山风景名胜区,4,140900
-140981,原平市,4,140900
-141002,尧都区,4,141000
-141021,曲沃县,4,141000
-141022,翼城县,4,141000
-141023,襄汾县,4,141000
-141024,洪洞县,4,141000
-141025,古县,4,141000
-141026,安泽县,4,141000
-141027,浮山县,4,141000
-141028,吉县,4,141000
-141029,乡宁县,4,141000
-141030,大宁县,4,141000
-141031,隰县,4,141000
-141032,永和县,4,141000
-141033,蒲县,4,141000
-141034,汾西县,4,141000
-141081,侯马市,4,141000
-141082,霍州市,4,141000
-141102,离石区,4,141100
-141121,文水县,4,141100
-141122,交城县,4,141100
-141123,兴县,4,141100
-141124,临县,4,141100
-141125,柳林县,4,141100
-141126,石楼县,4,141100
-141127,岚县,4,141100
-141128,方山县,4,141100
-141129,中阳县,4,141100
-141130,交口县,4,141100
-141181,孝义市,4,141100
-141182,汾阳市,4,141100
-150102,新城区,4,150100
-150103,回民区,4,150100
-150104,玉泉区,4,150100
-150105,赛罕区,4,150100
-150121,土默特左旗,4,150100
-150122,托克托县,4,150100
-150123,和林格尔县,4,150100
-150124,清水河县,4,150100
-150125,武川县,4,150100
-150172,呼和浩特经济技术开发区,4,150100
-150202,东河区,4,150200
-150203,昆都仑区,4,150200
-150204,青山区,4,150200
-150205,石拐区,4,150200
-150206,白云鄂博矿区,4,150200
-150207,九原区,4,150200
-150221,土默特右旗,4,150200
-150222,固阳县,4,150200
-150223,达尔罕茂明安联合旗,4,150200
-150271,包头稀土高新技术产业开发区,4,150200
-150302,海勃湾区,4,150300
-150303,海南区,4,150300
-150304,乌达区,4,150300
-150402,红山区,4,150400
-150403,元宝山区,4,150400
-150404,松山区,4,150400
-150421,阿鲁科尔沁旗,4,150400
-150422,巴林左旗,4,150400
-150423,巴林右旗,4,150400
-150424,林西县,4,150400
-150425,克什克腾旗,4,150400
-150426,翁牛特旗,4,150400
-150428,喀喇沁旗,4,150400
-150429,宁城县,4,150400
-150430,敖汉旗,4,150400
-150502,科尔沁区,4,150500
-150521,科尔沁左翼中旗,4,150500
-150522,科尔沁左翼后旗,4,150500
-150523,开鲁县,4,150500
-150524,库伦旗,4,150500
-150525,奈曼旗,4,150500
-150526,扎鲁特旗,4,150500
-150571,通辽经济技术开发区,4,150500
-150581,霍林郭勒市,4,150500
-150602,东胜区,4,150600
-150603,康巴什区,4,150600
-150621,达拉特旗,4,150600
-150622,准格尔旗,4,150600
-150623,鄂托克前旗,4,150600
-150624,鄂托克旗,4,150600
-150625,杭锦旗,4,150600
-150626,乌审旗,4,150600
-150627,伊金霍洛旗,4,150600
-150702,海拉尔区,4,150700
-150703,扎赉诺尔区,4,150700
-150721,阿荣旗,4,150700
-150722,莫力达瓦达斡尔族自治旗,4,150700
-150723,鄂伦春自治旗,4,150700
-150724,鄂温克族自治旗,4,150700
-150725,陈巴尔虎旗,4,150700
-150726,新巴尔虎左旗,4,150700
-150727,新巴尔虎右旗,4,150700
-150781,满洲里市,4,150700
-150782,牙克石市,4,150700
-150783,扎兰屯市,4,150700
-150784,额尔古纳市,4,150700
-150785,根河市,4,150700
-150802,临河区,4,150800
-150821,五原县,4,150800
-150822,磴口县,4,150800
-150823,乌拉特前旗,4,150800
-150824,乌拉特中旗,4,150800
-150825,乌拉特后旗,4,150800
-150826,杭锦后旗,4,150800
-150902,集宁区,4,150900
-150921,卓资县,4,150900
-150922,化德县,4,150900
-150923,商都县,4,150900
-150924,兴和县,4,150900
-150925,凉城县,4,150900
-150926,察哈尔右翼前旗,4,150900
-150927,察哈尔右翼中旗,4,150900
-150928,察哈尔右翼后旗,4,150900
-150929,四子王旗,4,150900
-150981,丰镇市,4,150900
-152201,乌兰浩特市,4,152200
-152202,阿尔山市,4,152200
-152221,科尔沁右翼前旗,4,152200
-152222,科尔沁右翼中旗,4,152200
-152223,扎赉特旗,4,152200
-152224,突泉县,4,152200
-152501,二连浩特市,4,152500
-152502,锡林浩特市,4,152500
-152522,阿巴嘎旗,4,152500
-152523,苏尼特左旗,4,152500
-152524,苏尼特右旗,4,152500
-152525,东乌珠穆沁旗,4,152500
-152526,西乌珠穆沁旗,4,152500
-152527,太仆寺旗,4,152500
-152528,镶黄旗,4,152500
-152529,正镶白旗,4,152500
-152530,正蓝旗,4,152500
-152531,多伦县,4,152500
-152571,乌拉盖管委会,4,152500
-152921,阿拉善左旗,4,152900
-152922,阿拉善右旗,4,152900
-152923,额济纳旗,4,152900
-152971,内蒙古阿拉善高新技术产业开发区,4,152900
-210102,和平区,4,210100
-210103,沈河区,4,210100
-210104,大东区,4,210100
-210105,皇姑区,4,210100
-210106,铁西区,4,210100
-210111,苏家屯区,4,210100
-210112,浑南区,4,210100
-210113,沈北新区,4,210100
-210114,于洪区,4,210100
-210115,辽中区,4,210100
-210123,康平县,4,210100
-210124,法库县,4,210100
-210181,新民市,4,210100
-210202,中山区,4,210200
-210203,西岗区,4,210200
-210204,沙河口区,4,210200
-210211,甘井子区,4,210200
-210212,旅顺口区,4,210200
-210213,金州区,4,210200
-210214,普兰店区,4,210200
-210224,长海县,4,210200
-210281,瓦房店市,4,210200
-210283,庄河市,4,210200
-210302,铁东区,4,210300
-210303,铁西区,4,210300
-210304,立山区,4,210300
-210311,千山区,4,210300
-210321,台安县,4,210300
-210323,岫岩满族自治县,4,210300
-210381,海城市,4,210300
-210402,新抚区,4,210400
-210403,东洲区,4,210400
-210404,望花区,4,210400
-210411,顺城区,4,210400
-210421,抚顺县,4,210400
-210422,新宾满族自治县,4,210400
-210423,清原满族自治县,4,210400
-210502,平山区,4,210500
-210503,溪湖区,4,210500
-210504,明山区,4,210500
-210505,南芬区,4,210500
-210521,本溪满族自治县,4,210500
-210522,桓仁满族自治县,4,210500
-210602,元宝区,4,210600
-210603,振兴区,4,210600
-210604,振安区,4,210600
-210624,宽甸满族自治县,4,210600
-210681,东港市,4,210600
-210682,凤城市,4,210600
-210702,古塔区,4,210700
-210703,凌河区,4,210700
-210711,太和区,4,210700
-210726,黑山县,4,210700
-210727,义县,4,210700
-210781,凌海市,4,210700
-210782,北镇市,4,210700
-210802,站前区,4,210800
-210803,西市区,4,210800
-210804,鲅鱼圈区,4,210800
-210811,老边区,4,210800
-210881,盖州市,4,210800
-210882,大石桥市,4,210800
-210902,海州区,4,210900
-210903,新邱区,4,210900
-210904,太平区,4,210900
-210905,清河门区,4,210900
-210911,细河区,4,210900
-210921,阜新蒙古族自治县,4,210900
-210922,彰武县,4,210900
-211002,白塔区,4,211000
-211003,文圣区,4,211000
-211004,宏伟区,4,211000
-211005,弓长岭区,4,211000
-211011,太子河区,4,211000
-211021,辽阳县,4,211000
-211081,灯塔市,4,211000
-211102,双台子区,4,211100
-211103,兴隆台区,4,211100
-211104,大洼区,4,211100
-211122,盘山县,4,211100
-211202,银州区,4,211200
-211204,清河区,4,211200
-211221,铁岭县,4,211200
-211223,西丰县,4,211200
-211224,昌图县,4,211200
-211281,调兵山市,4,211200
-211282,开原市,4,211200
-211302,双塔区,4,211300
-211303,龙城区,4,211300
-211321,朝阳县,4,211300
-211322,建平县,4,211300
-211324,喀喇沁左翼蒙古族自治县,4,211300
-211381,北票市,4,211300
-211382,凌源市,4,211300
-211402,连山区,4,211400
-211403,龙港区,4,211400
-211404,南票区,4,211400
-211421,绥中县,4,211400
-211422,建昌县,4,211400
-211481,兴城市,4,211400
-220102,南关区,4,220100
-220103,宽城区,4,220100
-220104,朝阳区,4,220100
-220105,二道区,4,220100
-220106,绿园区,4,220100
-220112,双阳区,4,220100
-220113,九台区,4,220100
-220122,农安县,4,220100
-220171,长春经济技术开发区,4,220100
-220172,长春净月高新技术产业开发区,4,220100
-220173,长春高新技术产业开发区,4,220100
-220174,长春汽车经济技术开发区,4,220100
-220182,榆树市,4,220100
-220183,德惠市,4,220100
-220184,公主岭市,4,220100
-220202,昌邑区,4,220200
-220203,龙潭区,4,220200
-220204,船营区,4,220200
-220211,丰满区,4,220200
-220221,永吉县,4,220200
-220271,吉林经济开发区,4,220200
-220272,吉林高新技术产业开发区,4,220200
-220273,吉林中国新加坡食品区,4,220200
-220281,蛟河市,4,220200
-220282,桦甸市,4,220200
-220283,舒兰市,4,220200
-220284,磐石市,4,220200
-220302,铁西区,4,220300
-220303,铁东区,4,220300
-220322,梨树县,4,220300
-220323,伊通满族自治县,4,220300
-220382,双辽市,4,220300
-220402,龙山区,4,220400
-220403,西安区,4,220400
-220421,东丰县,4,220400
-220422,东辽县,4,220400
-220502,东昌区,4,220500
-220503,二道江区,4,220500
-220521,通化县,4,220500
-220523,辉南县,4,220500
-220524,柳河县,4,220500
-220581,梅河口市,4,220500
-220582,集安市,4,220500
-220602,浑江区,4,220600
-220605,江源区,4,220600
-220621,抚松县,4,220600
-220622,靖宇县,4,220600
-220623,长白朝鲜族自治县,4,220600
-220681,临江市,4,220600
-220702,宁江区,4,220700
-220721,前郭尔罗斯蒙古族自治县,4,220700
-220722,长岭县,4,220700
-220723,乾安县,4,220700
-220771,吉林松原经济开发区,4,220700
-220781,扶余市,4,220700
-220802,洮北区,4,220800
-220821,镇赉县,4,220800
-220822,通榆县,4,220800
-220871,吉林白城经济开发区,4,220800
-220881,洮南市,4,220800
-220882,大安市,4,220800
-222401,延吉市,4,222400
-222402,图们市,4,222400
-222403,敦化市,4,222400
-222404,珲春市,4,222400
-222405,龙井市,4,222400
-222406,和龙市,4,222400
-222424,汪清县,4,222400
-222426,安图县,4,222400
-230102,道里区,4,230100
-230103,南岗区,4,230100
-230104,道外区,4,230100
-230108,平房区,4,230100
-230109,松北区,4,230100
-230110,香坊区,4,230100
-230111,呼兰区,4,230100
-230112,阿城区,4,230100
-230113,双城区,4,230100
-230123,依兰县,4,230100
-230124,方正县,4,230100
-230125,宾县,4,230100
-230126,巴彦县,4,230100
-230127,木兰县,4,230100
-230128,通河县,4,230100
-230129,延寿县,4,230100
-230183,尚志市,4,230100
-230184,五常市,4,230100
-230202,龙沙区,4,230200
-230203,建华区,4,230200
-230204,铁锋区,4,230200
-230205,昂昂溪区,4,230200
-230206,富拉尔基区,4,230200
-230207,碾子山区,4,230200
-230208,梅里斯达斡尔族区,4,230200
-230221,龙江县,4,230200
-230223,依安县,4,230200
-230224,泰来县,4,230200
-230225,甘南县,4,230200
-230227,富裕县,4,230200
-230229,克山县,4,230200
-230230,克东县,4,230200
-230231,拜泉县,4,230200
-230281,讷河市,4,230200
-230302,鸡冠区,4,230300
-230303,恒山区,4,230300
-230304,滴道区,4,230300
-230305,梨树区,4,230300
-230306,城子河区,4,230300
-230307,麻山区,4,230300
-230321,鸡东县,4,230300
-230381,虎林市,4,230300
-230382,密山市,4,230300
-230402,向阳区,4,230400
-230403,工农区,4,230400
-230404,南山区,4,230400
-230405,兴安区,4,230400
-230406,东山区,4,230400
-230407,兴山区,4,230400
-230421,萝北县,4,230400
-230422,绥滨县,4,230400
-230502,尖山区,4,230500
-230503,岭东区,4,230500
-230505,四方台区,4,230500
-230506,宝山区,4,230500
-230521,集贤县,4,230500
-230522,友谊县,4,230500
-230523,宝清县,4,230500
-230524,饶河县,4,230500
-230602,萨尔图区,4,230600
-230603,龙凤区,4,230600
-230604,让胡路区,4,230600
-230605,红岗区,4,230600
-230606,大同区,4,230600
-230621,肇州县,4,230600
-230622,肇源县,4,230600
-230623,林甸县,4,230600
-230624,杜尔伯特蒙古族自治县,4,230600
-230671,大庆高新技术产业开发区,4,230600
-230717,伊美区,4,230700
-230718,乌翠区,4,230700
-230719,友好区,4,230700
-230722,嘉荫县,4,230700
-230723,汤旺县,4,230700
-230724,丰林县,4,230700
-230725,大箐山县,4,230700
-230726,南岔县,4,230700
-230751,金林区,4,230700
-230781,铁力市,4,230700
-230803,向阳区,4,230800
-230804,前进区,4,230800
-230805,东风区,4,230800
-230811,郊区,4,230800
-230822,桦南县,4,230800
-230826,桦川县,4,230800
-230828,汤原县,4,230800
-230881,同江市,4,230800
-230882,富锦市,4,230800
-230883,抚远市,4,230800
-230902,新兴区,4,230900
-230903,桃山区,4,230900
-230904,茄子河区,4,230900
-230921,勃利县,4,230900
-231002,东安区,4,231000
-231003,阳明区,4,231000
-231004,爱民区,4,231000
-231005,西安区,4,231000
-231025,林口县,4,231000
-231071,牡丹江经济技术开发区,4,231000
-231081,绥芬河市,4,231000
-231083,海林市,4,231000
-231084,宁安市,4,231000
-231085,穆棱市,4,231000
-231086,东宁市,4,231000
-231102,爱辉区,4,231100
-231123,逊克县,4,231100
-231124,孙吴县,4,231100
-231181,北安市,4,231100
-231182,五大连池市,4,231100
-231183,嫩江市,4,231100
-231202,北林区,4,231200
-231221,望奎县,4,231200
-231222,兰西县,4,231200
-231223,青冈县,4,231200
-231224,庆安县,4,231200
-231225,明水县,4,231200
-231226,绥棱县,4,231200
-231281,安达市,4,231200
-231282,肇东市,4,231200
-231283,海伦市,4,231200
-232701,漠河市,4,232700
-232721,呼玛县,4,232700
-232722,塔河县,4,232700
-232761,加格达奇区,4,232700
-232762,松岭区,4,232700
-232763,新林区,4,232700
-232764,呼中区,4,232700
-310101,黄浦区,4,310100
-310104,徐汇区,4,310100
-310105,长宁区,4,310100
-310106,静安区,4,310100
-310107,普陀区,4,310100
-310109,虹口区,4,310100
-310110,杨浦区,4,310100
-310112,闵行区,4,310100
-310113,宝山区,4,310100
-310114,嘉定区,4,310100
-310115,浦东新区,4,310100
-310116,金山区,4,310100
-310117,松江区,4,310100
-310118,青浦区,4,310100
-310120,奉贤区,4,310100
-310151,崇明区,4,310100
-320102,玄武区,4,320100
-320104,秦淮区,4,320100
-320105,建邺区,4,320100
-320106,鼓楼区,4,320100
-320111,浦口区,4,320100
-320113,栖霞区,4,320100
-320114,雨花台区,4,320100
-320115,江宁区,4,320100
-320116,六合区,4,320100
-320117,溧水区,4,320100
-320118,高淳区,4,320100
-320205,锡山区,4,320200
-320206,惠山区,4,320200
-320211,滨湖区,4,320200
-320213,梁溪区,4,320200
-320214,新吴区,4,320200
-320281,江阴市,4,320200
-320282,宜兴市,4,320200
-320302,鼓楼区,4,320300
-320303,云龙区,4,320300
-320305,贾汪区,4,320300
-320311,泉山区,4,320300
-320312,铜山区,4,320300
-320321,丰县,4,320300
-320322,沛县,4,320300
-320324,睢宁县,4,320300
-320371,徐州经济技术开发区,4,320300
-320381,新沂市,4,320300
-320382,邳州市,4,320300
-320402,天宁区,4,320400
-320404,钟楼区,4,320400
-320411,新北区,4,320400
-320412,武进区,4,320400
-320413,金坛区,4,320400
-320481,溧阳市,4,320400
-320505,虎丘区,4,320500
-320506,吴中区,4,320500
-320507,相城区,4,320500
-320508,姑苏区,4,320500
-320509,吴江区,4,320500
-320571,苏州工业园区,4,320500
-320581,常熟市,4,320500
-320582,张家港市,4,320500
-320583,昆山市,4,320500
-320585,太仓市,4,320500
-320612,通州区,4,320600
-320613,崇川区,4,320600
-320614,海门区,4,320600
-320623,如东县,4,320600
-320671,南通经济技术开发区,4,320600
-320681,启东市,4,320600
-320682,如皋市,4,320600
-320685,海安市,4,320600
-320703,连云区,4,320700
-320706,海州区,4,320700
-320707,赣榆区,4,320700
-320722,东海县,4,320700
-320723,灌云县,4,320700
-320724,灌南县,4,320700
-320771,连云港经济技术开发区,4,320700
-320772,连云港高新技术产业开发区,4,320700
-320803,淮安区,4,320800
-320804,淮阴区,4,320800
-320812,清江浦区,4,320800
-320813,洪泽区,4,320800
-320826,涟水县,4,320800
-320830,盱眙县,4,320800
-320831,金湖县,4,320800
-320871,淮安经济技术开发区,4,320800
-320902,亭湖区,4,320900
-320903,盐都区,4,320900
-320904,大丰区,4,320900
-320921,响水县,4,320900
-320922,滨海县,4,320900
-320923,阜宁县,4,320900
-320924,射阳县,4,320900
-320925,建湖县,4,320900
-320971,盐城经济技术开发区,4,320900
-320981,东台市,4,320900
-321002,广陵区,4,321000
-321003,邗江区,4,321000
-321012,江都区,4,321000
-321023,宝应县,4,321000
-321071,扬州经济技术开发区,4,321000
-321081,仪征市,4,321000
-321084,高邮市,4,321000
-321102,京口区,4,321100
-321111,润州区,4,321100
-321112,丹徒区,4,321100
-321171,镇江新区,4,321100
-321181,丹阳市,4,321100
-321182,扬中市,4,321100
-321183,句容市,4,321100
-321202,海陵区,4,321200
-321203,高港区,4,321200
-321204,姜堰区,4,321200
-321271,泰州医药高新技术产业开发区,4,321200
-321281,兴化市,4,321200
-321282,靖江市,4,321200
-321283,泰兴市,4,321200
-321302,宿城区,4,321300
-321311,宿豫区,4,321300
-321322,沭阳县,4,321300
-321323,泗阳县,4,321300
-321324,泗洪县,4,321300
-321371,宿迁经济技术开发区,4,321300
-330102,上城区,4,330100
-330105,拱墅区,4,330100
-330106,西湖区,4,330100
-330108,滨江区,4,330100
-330109,萧山区,4,330100
-330110,余杭区,4,330100
-330111,富阳区,4,330100
-330112,临安区,4,330100
-330113,临平区,4,330100
-330114,钱塘区,4,330100
-330122,桐庐县,4,330100
-330127,淳安县,4,330100
-330182,建德市,4,330100
-330203,海曙区,4,330200
-330205,江北区,4,330200
-330206,北仑区,4,330200
-330211,镇海区,4,330200
-330212,鄞州区,4,330200
-330213,奉化区,4,330200
-330225,象山县,4,330200
-330226,宁海县,4,330200
-330281,余姚市,4,330200
-330282,慈溪市,4,330200
-330302,鹿城区,4,330300
-330303,龙湾区,4,330300
-330304,瓯海区,4,330300
-330305,洞头区,4,330300
-330324,永嘉县,4,330300
-330326,平阳县,4,330300
-330327,苍南县,4,330300
-330328,文成县,4,330300
-330329,泰顺县,4,330300
-330371,温州经济技术开发区,4,330300
-330381,瑞安市,4,330300
-330382,乐清市,4,330300
-330383,龙港市,4,330300
-330402,南湖区,4,330400
-330411,秀洲区,4,330400
-330421,嘉善县,4,330400
-330424,海盐县,4,330400
-330481,海宁市,4,330400
-330482,平湖市,4,330400
-330483,桐乡市,4,330400
-330502,吴兴区,4,330500
-330503,南浔区,4,330500
-330521,德清县,4,330500
-330522,长兴县,4,330500
-330523,安吉县,4,330500
-330602,越城区,4,330600
-330603,柯桥区,4,330600
-330604,上虞区,4,330600
-330624,新昌县,4,330600
-330681,诸暨市,4,330600
-330683,嵊州市,4,330600
-330702,婺城区,4,330700
-330703,金东区,4,330700
-330723,武义县,4,330700
-330726,浦江县,4,330700
-330727,磐安县,4,330700
-330781,兰溪市,4,330700
-330782,义乌市,4,330700
-330783,东阳市,4,330700
-330784,永康市,4,330700
-330802,柯城区,4,330800
-330803,衢江区,4,330800
-330822,常山县,4,330800
-330824,开化县,4,330800
-330825,龙游县,4,330800
-330881,江山市,4,330800
-330902,定海区,4,330900
-330903,普陀区,4,330900
-330921,岱山县,4,330900
-330922,嵊泗县,4,330900
-331002,椒江区,4,331000
-331003,黄岩区,4,331000
-331004,路桥区,4,331000
-331022,三门县,4,331000
-331023,天台县,4,331000
-331024,仙居县,4,331000
-331081,温岭市,4,331000
-331082,临海市,4,331000
-331083,玉环市,4,331000
-331102,莲都区,4,331100
-331121,青田县,4,331100
-331122,缙云县,4,331100
-331123,遂昌县,4,331100
-331124,松阳县,4,331100
-331125,云和县,4,331100
-331126,庆元县,4,331100
-331127,景宁畲族自治县,4,331100
-331181,龙泉市,4,331100
-340102,瑶海区,4,340100
-340103,庐阳区,4,340100
-340104,蜀山区,4,340100
-340111,包河区,4,340100
-340121,长丰县,4,340100
-340122,肥东县,4,340100
-340123,肥西县,4,340100
-340124,庐江县,4,340100
-340171,合肥高新技术产业开发区,4,340100
-340172,合肥经济技术开发区,4,340100
-340173,合肥新站高新技术产业开发区,4,340100
-340181,巢湖市,4,340100
-340202,镜湖区,4,340200
-340207,鸠江区,4,340200
-340209,弋江区,4,340200
-340210,湾沚区,4,340200
-340212,繁昌区,4,340200
-340223,南陵县,4,340200
-340271,芜湖经济技术开发区,4,340200
-340272,安徽芜湖三山经济开发区,4,340200
-340281,无为市,4,340200
-340302,龙子湖区,4,340300
-340303,蚌山区,4,340300
-340304,禹会区,4,340300
-340311,淮上区,4,340300
-340321,怀远县,4,340300
-340322,五河县,4,340300
-340323,固镇县,4,340300
-340371,蚌埠市高新技术开发区,4,340300
-340372,蚌埠市经济开发区,4,340300
-340402,大通区,4,340400
-340403,田家庵区,4,340400
-340404,谢家集区,4,340400
-340405,八公山区,4,340400
-340406,潘集区,4,340400
-340421,凤台县,4,340400
-340422,寿县,4,340400
-340503,花山区,4,340500
-340504,雨山区,4,340500
-340506,博望区,4,340500
-340521,当涂县,4,340500
-340522,含山县,4,340500
-340523,和县,4,340500
-340602,杜集区,4,340600
-340603,相山区,4,340600
-340604,烈山区,4,340600
-340621,濉溪县,4,340600
-340705,铜官区,4,340700
-340706,义安区,4,340700
-340711,郊区,4,340700
-340722,枞阳县,4,340700
-340802,迎江区,4,340800
-340803,大观区,4,340800
-340811,宜秀区,4,340800
-340822,怀宁县,4,340800
-340825,太湖县,4,340800
-340826,宿松县,4,340800
-340827,望江县,4,340800
-340828,岳西县,4,340800
-340871,安徽安庆经济开发区,4,340800
-340881,桐城市,4,340800
-340882,潜山市,4,340800
-341002,屯溪区,4,341000
-341003,黄山区,4,341000
-341004,徽州区,4,341000
-341021,歙县,4,341000
-341022,休宁县,4,341000
-341023,黟县,4,341000
-341024,祁门县,4,341000
-341102,琅琊区,4,341100
-341103,南谯区,4,341100
-341122,来安县,4,341100
-341124,全椒县,4,341100
-341125,定远县,4,341100
-341126,凤阳县,4,341100
-341171,中新苏滁高新技术产业开发区,4,341100
-341172,滁州经济技术开发区,4,341100
-341181,天长市,4,341100
-341182,明光市,4,341100
-341202,颍州区,4,341200
-341203,颍东区,4,341200
-341204,颍泉区,4,341200
-341221,临泉县,4,341200
-341222,太和县,4,341200
-341225,阜南县,4,341200
-341226,颍上县,4,341200
-341271,阜阳合肥现代产业园区,4,341200
-341272,阜阳经济技术开发区,4,341200
-341282,界首市,4,341200
-341302,埇桥区,4,341300
-341321,砀山县,4,341300
-341322,萧县,4,341300
-341323,灵璧县,4,341300
-341324,泗县,4,341300
-341371,宿州马鞍山现代产业园区,4,341300
-341372,宿州经济技术开发区,4,341300
-341502,金安区,4,341500
-341503,裕安区,4,341500
-341504,叶集区,4,341500
-341522,霍邱县,4,341500
-341523,舒城县,4,341500
-341524,金寨县,4,341500
-341525,霍山县,4,341500
-341602,谯城区,4,341600
-341621,涡阳县,4,341600
-341622,蒙城县,4,341600
-341623,利辛县,4,341600
-341702,贵池区,4,341700
-341721,东至县,4,341700
-341722,石台县,4,341700
-341723,青阳县,4,341700
-341802,宣州区,4,341800
-341821,郎溪县,4,341800
-341823,泾县,4,341800
-341824,绩溪县,4,341800
-341825,旌德县,4,341800
-341871,宣城市经济开发区,4,341800
-341881,宁国市,4,341800
-341882,广德市,4,341800
-350102,鼓楼区,4,350100
-350103,台江区,4,350100
-350104,仓山区,4,350100
-350105,马尾区,4,350100
-350111,晋安区,4,350100
-350112,长乐区,4,350100
-350121,闽侯县,4,350100
-350122,连江县,4,350100
-350123,罗源县,4,350100
-350124,闽清县,4,350100
-350125,永泰县,4,350100
-350128,平潭县,4,350100
-350181,福清市,4,350100
-350203,思明区,4,350200
-350205,海沧区,4,350200
-350206,湖里区,4,350200
-350211,集美区,4,350200
-350212,同安区,4,350200
-350213,翔安区,4,350200
-350302,城厢区,4,350300
-350303,涵江区,4,350300
-350304,荔城区,4,350300
-350305,秀屿区,4,350300
-350322,仙游县,4,350300
-350404,三元区,4,350400
-350405,沙县区,4,350400
-350421,明溪县,4,350400
-350423,清流县,4,350400
-350424,宁化县,4,350400
-350425,大田县,4,350400
-350426,尤溪县,4,350400
-350428,将乐县,4,350400
-350429,泰宁县,4,350400
-350430,建宁县,4,350400
-350481,永安市,4,350400
-350502,鲤城区,4,350500
-350503,丰泽区,4,350500
-350504,洛江区,4,350500
-350505,泉港区,4,350500
-350521,惠安县,4,350500
-350524,安溪县,4,350500
-350525,永春县,4,350500
-350526,德化县,4,350500
-350527,金门县,4,350500
-350581,石狮市,4,350500
-350582,晋江市,4,350500
-350583,南安市,4,350500
-350602,芗城区,4,350600
-350603,龙文区,4,350600
-350604,龙海区,4,350600
-350605,长泰区,4,350600
-350622,云霄县,4,350600
-350623,漳浦县,4,350600
-350624,诏安县,4,350600
-350626,东山县,4,350600
-350627,南靖县,4,350600
-350628,平和县,4,350600
-350629,华安县,4,350600
-350702,延平区,4,350700
-350703,建阳区,4,350700
-350721,顺昌县,4,350700
-350722,浦城县,4,350700
-350723,光泽县,4,350700
-350724,松溪县,4,350700
-350725,政和县,4,350700
-350781,邵武市,4,350700
-350782,武夷山市,4,350700
-350783,建瓯市,4,350700
-350802,新罗区,4,350800
-350803,永定区,4,350800
-350821,长汀县,4,350800
-350823,上杭县,4,350800
-350824,武平县,4,350800
-350825,连城县,4,350800
-350881,漳平市,4,350800
-350902,蕉城区,4,350900
-350921,霞浦县,4,350900
-350922,古田县,4,350900
-350923,屏南县,4,350900
-350924,寿宁县,4,350900
-350925,周宁县,4,350900
-350926,柘荣县,4,350900
-350981,福安市,4,350900
-350982,福鼎市,4,350900
-360102,东湖区,4,360100
-360103,西湖区,4,360100
-360104,青云谱区,4,360100
-360111,青山湖区,4,360100
-360112,新建区,4,360100
-360113,红谷滩区,4,360100
-360121,南昌县,4,360100
-360123,安义县,4,360100
-360124,进贤县,4,360100
-360202,昌江区,4,360200
-360203,珠山区,4,360200
-360222,浮梁县,4,360200
-360281,乐平市,4,360200
-360302,安源区,4,360300
-360313,湘东区,4,360300
-360321,莲花县,4,360300
-360322,上栗县,4,360300
-360323,芦溪县,4,360300
-360402,濂溪区,4,360400
-360403,浔阳区,4,360400
-360404,柴桑区,4,360400
-360423,武宁县,4,360400
-360424,修水县,4,360400
-360425,永修县,4,360400
-360426,德安县,4,360400
-360428,都昌县,4,360400
-360429,湖口县,4,360400
-360430,彭泽县,4,360400
-360481,瑞昌市,4,360400
-360482,共青城市,4,360400
-360483,庐山市,4,360400
-360502,渝水区,4,360500
-360521,分宜县,4,360500
-360602,月湖区,4,360600
-360603,余江区,4,360600
-360681,贵溪市,4,360600
-360702,章贡区,4,360700
-360703,南康区,4,360700
-360704,赣县区,4,360700
-360722,信丰县,4,360700
-360723,大余县,4,360700
-360724,上犹县,4,360700
-360725,崇义县,4,360700
-360726,安远县,4,360700
-360728,定南县,4,360700
-360729,全南县,4,360700
-360730,宁都县,4,360700
-360731,于都县,4,360700
-360732,兴国县,4,360700
-360733,会昌县,4,360700
-360734,寻乌县,4,360700
-360735,石城县,4,360700
-360781,瑞金市,4,360700
-360783,龙南市,4,360700
-360802,吉州区,4,360800
-360803,青原区,4,360800
-360821,吉安县,4,360800
-360822,吉水县,4,360800
-360823,峡江县,4,360800
-360824,新干县,4,360800
-360825,永丰县,4,360800
-360826,泰和县,4,360800
-360827,遂川县,4,360800
-360828,万安县,4,360800
-360829,安福县,4,360800
-360830,永新县,4,360800
-360881,井冈山市,4,360800
-360902,袁州区,4,360900
-360921,奉新县,4,360900
-360922,万载县,4,360900
-360923,上高县,4,360900
-360924,宜丰县,4,360900
-360925,靖安县,4,360900
-360926,铜鼓县,4,360900
-360981,丰城市,4,360900
-360982,樟树市,4,360900
-360983,高安市,4,360900
-361002,临川区,4,361000
-361003,东乡区,4,361000
-361021,南城县,4,361000
-361022,黎川县,4,361000
-361023,南丰县,4,361000
-361024,崇仁县,4,361000
-361025,乐安县,4,361000
-361026,宜黄县,4,361000
-361027,金溪县,4,361000
-361028,资溪县,4,361000
-361030,广昌县,4,361000
-361102,信州区,4,361100
-361103,广丰区,4,361100
-361104,广信区,4,361100
-361123,玉山县,4,361100
-361124,铅山县,4,361100
-361125,横峰县,4,361100
-361126,弋阳县,4,361100
-361127,余干县,4,361100
-361128,鄱阳县,4,361100
-361129,万年县,4,361100
-361130,婺源县,4,361100
-361181,德兴市,4,361100
-370102,历下区,4,370100
-370103,市中区,4,370100
-370104,槐荫区,4,370100
-370105,天桥区,4,370100
-370112,历城区,4,370100
-370113,长清区,4,370100
-370114,章丘区,4,370100
-370115,济阳区,4,370100
-370116,莱芜区,4,370100
-370117,钢城区,4,370100
-370124,平阴县,4,370100
-370126,商河县,4,370100
-370171,济南高新技术产业开发区,4,370100
-370202,市南区,4,370200
-370203,市北区,4,370200
-370211,黄岛区,4,370200
-370212,崂山区,4,370200
-370213,李沧区,4,370200
-370214,城阳区,4,370200
-370215,即墨区,4,370200
-370271,青岛高新技术产业开发区,4,370200
-370281,胶州市,4,370200
-370283,平度市,4,370200
-370285,莱西市,4,370200
-370302,淄川区,4,370300
-370303,张店区,4,370300
-370304,博山区,4,370300
-370305,临淄区,4,370300
-370306,周村区,4,370300
-370321,桓台县,4,370300
-370322,高青县,4,370300
-370323,沂源县,4,370300
-370402,市中区,4,370400
-370403,薛城区,4,370400
-370404,峄城区,4,370400
-370405,台儿庄区,4,370400
-370406,山亭区,4,370400
-370481,滕州市,4,370400
-370502,东营区,4,370500
-370503,河口区,4,370500
-370505,垦利区,4,370500
-370522,利津县,4,370500
-370523,广饶县,4,370500
-370571,东营经济技术开发区,4,370500
-370572,东营港经济开发区,4,370500
-370602,芝罘区,4,370600
-370611,福山区,4,370600
-370612,牟平区,4,370600
-370613,莱山区,4,370600
-370614,蓬莱区,4,370600
-370671,烟台高新技术产业开发区,4,370600
-370672,烟台经济技术开发区,4,370600
-370681,龙口市,4,370600
-370682,莱阳市,4,370600
-370683,莱州市,4,370600
-370685,招远市,4,370600
-370686,栖霞市,4,370600
-370687,海阳市,4,370600
-370702,潍城区,4,370700
-370703,寒亭区,4,370700
-370704,坊子区,4,370700
-370705,奎文区,4,370700
-370724,临朐县,4,370700
-370725,昌乐县,4,370700
-370772,潍坊滨海经济技术开发区,4,370700
-370781,青州市,4,370700
-370782,诸城市,4,370700
-370783,寿光市,4,370700
-370784,安丘市,4,370700
-370785,高密市,4,370700
-370786,昌邑市,4,370700
-370811,任城区,4,370800
-370812,兖州区,4,370800
-370826,微山县,4,370800
-370827,鱼台县,4,370800
-370828,金乡县,4,370800
-370829,嘉祥县,4,370800
-370830,汶上县,4,370800
-370831,泗水县,4,370800
-370832,梁山县,4,370800
-370871,济宁高新技术产业开发区,4,370800
-370881,曲阜市,4,370800
-370883,邹城市,4,370800
-370902,泰山区,4,370900
-370911,岱岳区,4,370900
-370921,宁阳县,4,370900
-370923,东平县,4,370900
-370982,新泰市,4,370900
-370983,肥城市,4,370900
-371002,环翠区,4,371000
-371003,文登区,4,371000
-371071,威海火炬高技术产业开发区,4,371000
-371072,威海经济技术开发区,4,371000
-371073,威海临港经济技术开发区,4,371000
-371082,荣成市,4,371000
-371083,乳山市,4,371000
-371102,东港区,4,371100
-371103,岚山区,4,371100
-371121,五莲县,4,371100
-371122,莒县,4,371100
-371171,日照经济技术开发区,4,371100
-371302,兰山区,4,371300
-371311,罗庄区,4,371300
-371312,河东区,4,371300
-371321,沂南县,4,371300
-371322,郯城县,4,371300
-371323,沂水县,4,371300
-371324,兰陵县,4,371300
-371325,费县,4,371300
-371326,平邑县,4,371300
-371327,莒南县,4,371300
-371328,蒙阴县,4,371300
-371329,临沭县,4,371300
-371371,临沂高新技术产业开发区,4,371300
-371402,德城区,4,371400
-371403,陵城区,4,371400
-371422,宁津县,4,371400
-371423,庆云县,4,371400
-371424,临邑县,4,371400
-371425,齐河县,4,371400
-371426,平原县,4,371400
-371427,夏津县,4,371400
-371428,武城县,4,371400
-371471,德州经济技术开发区,4,371400
-371472,德州运河经济开发区,4,371400
-371481,乐陵市,4,371400
-371482,禹城市,4,371400
-371502,东昌府区,4,371500
-371503,茌平区,4,371500
-371521,阳谷县,4,371500
-371522,莘县,4,371500
-371524,东阿县,4,371500
-371525,冠县,4,371500
-371526,高唐县,4,371500
-371581,临清市,4,371500
-371602,滨城区,4,371600
-371603,沾化区,4,371600
-371621,惠民县,4,371600
-371622,阳信县,4,371600
-371623,无棣县,4,371600
-371625,博兴县,4,371600
-371681,邹平市,4,371600
-371702,牡丹区,4,371700
-371703,定陶区,4,371700
-371721,曹县,4,371700
-371722,单县,4,371700
-371723,成武县,4,371700
-371724,巨野县,4,371700
-371725,郓城县,4,371700
-371726,鄄城县,4,371700
-371728,东明县,4,371700
-371771,菏泽经济技术开发区,4,371700
-371772,菏泽高新技术开发区,4,371700
-410102,中原区,4,410100
-410103,二七区,4,410100
-410104,管城回族区,4,410100
-410105,金水区,4,410100
-410106,上街区,4,410100
-410108,惠济区,4,410100
-410122,中牟县,4,410100
-410171,郑州经济技术开发区,4,410100
-410172,郑州高新技术产业开发区,4,410100
-410173,郑州航空港经济综合实验区,4,410100
-410181,巩义市,4,410100
-410182,荥阳市,4,410100
-410183,新密市,4,410100
-410184,新郑市,4,410100
-410185,登封市,4,410100
-410202,龙亭区,4,410200
-410203,顺河回族区,4,410200
-410204,鼓楼区,4,410200
-410205,禹王台区,4,410200
-410212,祥符区,4,410200
-410221,杞县,4,410200
-410222,通许县,4,410200
-410223,尉氏县,4,410200
-410225,兰考县,4,410200
-410302,老城区,4,410300
-410303,西工区,4,410300
-410304,瀍河回族区,4,410300
-410305,涧西区,4,410300
-410307,偃师区,4,410300
-410308,孟津区,4,410300
-410311,洛龙区,4,410300
-410323,新安县,4,410300
-410324,栾川县,4,410300
-410325,嵩县,4,410300
-410326,汝阳县,4,410300
-410327,宜阳县,4,410300
-410328,洛宁县,4,410300
-410329,伊川县,4,410300
-410371,洛阳高新技术产业开发区,4,410300
-410402,新华区,4,410400
-410403,卫东区,4,410400
-410404,石龙区,4,410400
-410411,湛河区,4,410400
-410421,宝丰县,4,410400
-410422,叶县,4,410400
-410423,鲁山县,4,410400
-410425,郏县,4,410400
-410471,平顶山高新技术产业开发区,4,410400
-410472,平顶山市城乡一体化示范区,4,410400
-410481,舞钢市,4,410400
-410482,汝州市,4,410400
-410502,文峰区,4,410500
-410503,北关区,4,410500
-410505,殷都区,4,410500
-410506,龙安区,4,410500
-410522,安阳县,4,410500
-410523,汤阴县,4,410500
-410526,滑县,4,410500
-410527,内黄县,4,410500
-410571,安阳高新技术产业开发区,4,410500
-410581,林州市,4,410500
-410602,鹤山区,4,410600
-410603,山城区,4,410600
-410611,淇滨区,4,410600
-410621,浚县,4,410600
-410622,淇县,4,410600
-410671,鹤壁经济技术开发区,4,410600
-410702,红旗区,4,410700
-410703,卫滨区,4,410700
-410704,凤泉区,4,410700
-410711,牧野区,4,410700
-410721,新乡县,4,410700
-410724,获嘉县,4,410700
-410725,原阳县,4,410700
-410726,延津县,4,410700
-410727,封丘县,4,410700
-410771,新乡高新技术产业开发区,4,410700
-410772,新乡经济技术开发区,4,410700
-410773,新乡市平原城乡一体化示范区,4,410700
-410781,卫辉市,4,410700
-410782,辉县市,4,410700
-410783,长垣市,4,410700
-410802,解放区,4,410800
-410803,中站区,4,410800
-410804,马村区,4,410800
-410811,山阳区,4,410800
-410821,修武县,4,410800
-410822,博爱县,4,410800
-410823,武陟县,4,410800
-410825,温县,4,410800
-410871,焦作城乡一体化示范区,4,410800
-410882,沁阳市,4,410800
-410883,孟州市,4,410800
-410902,华龙区,4,410900
-410922,清丰县,4,410900
-410923,南乐县,4,410900
-410926,范县,4,410900
-410927,台前县,4,410900
-410928,濮阳县,4,410900
-410971,河南濮阳工业园区,4,410900
-410972,濮阳经济技术开发区,4,410900
-411002,魏都区,4,411000
-411003,建安区,4,411000
-411024,鄢陵县,4,411000
-411025,襄城县,4,411000
-411071,许昌经济技术开发区,4,411000
-411081,禹州市,4,411000
-411082,长葛市,4,411000
-411102,源汇区,4,411100
-411103,郾城区,4,411100
-411104,召陵区,4,411100
-411121,舞阳县,4,411100
-411122,临颍县,4,411100
-411171,漯河经济技术开发区,4,411100
-411202,湖滨区,4,411200
-411203,陕州区,4,411200
-411221,渑池县,4,411200
-411224,卢氏县,4,411200
-411271,河南三门峡经济开发区,4,411200
-411281,义马市,4,411200
-411282,灵宝市,4,411200
-411302,宛城区,4,411300
-411303,卧龙区,4,411300
-411321,南召县,4,411300
-411322,方城县,4,411300
-411323,西峡县,4,411300
-411324,镇平县,4,411300
-411325,内乡县,4,411300
-411326,淅川县,4,411300
-411327,社旗县,4,411300
-411328,唐河县,4,411300
-411329,新野县,4,411300
-411330,桐柏县,4,411300
-411371,南阳高新技术产业开发区,4,411300
-411372,南阳市城乡一体化示范区,4,411300
-411381,邓州市,4,411300
-411402,梁园区,4,411400
-411403,睢阳区,4,411400
-411421,民权县,4,411400
-411422,睢县,4,411400
-411423,宁陵县,4,411400
-411424,柘城县,4,411400
-411425,虞城县,4,411400
-411426,夏邑县,4,411400
-411471,豫东综合物流产业聚集区,4,411400
-411472,河南商丘经济开发区,4,411400
-411481,永城市,4,411400
-411502,浉河区,4,411500
-411503,平桥区,4,411500
-411521,罗山县,4,411500
-411522,光山县,4,411500
-411523,新县,4,411500
-411524,商城县,4,411500
-411525,固始县,4,411500
-411526,潢川县,4,411500
-411527,淮滨县,4,411500
-411528,息县,4,411500
-411571,信阳高新技术产业开发区,4,411500
-411602,川汇区,4,411600
-411603,淮阳区,4,411600
-411621,扶沟县,4,411600
-411622,西华县,4,411600
-411623,商水县,4,411600
-411624,沈丘县,4,411600
-411625,郸城县,4,411600
-411627,太康县,4,411600
-411628,鹿邑县,4,411600
-411671,河南周口经济开发区,4,411600
-411681,项城市,4,411600
-411702,驿城区,4,411700
-411721,西平县,4,411700
-411722,上蔡县,4,411700
-411723,平舆县,4,411700
-411724,正阳县,4,411700
-411725,确山县,4,411700
-411726,泌阳县,4,411700
-411727,汝南县,4,411700
-411728,遂平县,4,411700
-411729,新蔡县,4,411700
-411771,河南驻马店经济开发区,4,411700
-419001,济源市,4,419000
-420102,江岸区,4,420100
-420103,江汉区,4,420100
-420104,硚口区,4,420100
-420105,汉阳区,4,420100
-420106,武昌区,4,420100
-420107,青山区,4,420100
-420111,洪山区,4,420100
-420112,东西湖区,4,420100
-420113,汉南区,4,420100
-420114,蔡甸区,4,420100
-420115,江夏区,4,420100
-420116,黄陂区,4,420100
-420117,新洲区,4,420100
-420202,黄石港区,4,420200
-420203,西塞山区,4,420200
-420204,下陆区,4,420200
-420205,铁山区,4,420200
-420222,阳新县,4,420200
-420281,大冶市,4,420200
-420302,茅箭区,4,420300
-420303,张湾区,4,420300
-420304,郧阳区,4,420300
-420322,郧西县,4,420300
-420323,竹山县,4,420300
-420324,竹溪县,4,420300
-420325,房县,4,420300
-420381,丹江口市,4,420300
-420502,西陵区,4,420500
-420503,伍家岗区,4,420500
-420504,点军区,4,420500
-420505,猇亭区,4,420500
-420506,夷陵区,4,420500
-420525,远安县,4,420500
-420526,兴山县,4,420500
-420527,秭归县,4,420500
-420528,长阳土家族自治县,4,420500
-420529,五峰土家族自治县,4,420500
-420581,宜都市,4,420500
-420582,当阳市,4,420500
-420583,枝江市,4,420500
-420602,襄城区,4,420600
-420606,樊城区,4,420600
-420607,襄州区,4,420600
-420624,南漳县,4,420600
-420625,谷城县,4,420600
-420626,保康县,4,420600
-420682,老河口市,4,420600
-420683,枣阳市,4,420600
-420684,宜城市,4,420600
-420702,梁子湖区,4,420700
-420703,华容区,4,420700
-420704,鄂城区,4,420700
-420802,东宝区,4,420800
-420804,掇刀区,4,420800
-420822,沙洋县,4,420800
-420881,钟祥市,4,420800
-420882,京山市,4,420800
-420902,孝南区,4,420900
-420921,孝昌县,4,420900
-420922,大悟县,4,420900
-420923,云梦县,4,420900
-420981,应城市,4,420900
-420982,安陆市,4,420900
-420984,汉川市,4,420900
-421002,沙市区,4,421000
-421003,荆州区,4,421000
-421022,公安县,4,421000
-421024,江陵县,4,421000
-421071,荆州经济技术开发区,4,421000
-421081,石首市,4,421000
-421083,洪湖市,4,421000
-421087,松滋市,4,421000
-421088,监利市,4,421000
-421102,黄州区,4,421100
-421121,团风县,4,421100
-421122,红安县,4,421100
-421123,罗田县,4,421100
-421124,英山县,4,421100
-421125,浠水县,4,421100
-421126,蕲春县,4,421100
-421127,黄梅县,4,421100
-421171,龙感湖管理区,4,421100
-421181,麻城市,4,421100
-421182,武穴市,4,421100
-421202,咸安区,4,421200
-421221,嘉鱼县,4,421200
-421222,通城县,4,421200
-421223,崇阳县,4,421200
-421224,通山县,4,421200
-421281,赤壁市,4,421200
-421303,曾都区,4,421300
-421321,随县,4,421300
-421381,广水市,4,421300
-422801,恩施市,4,422800
-422802,利川市,4,422800
-422822,建始县,4,422800
-422823,巴东县,4,422800
-422825,宣恩县,4,422800
-422826,咸丰县,4,422800
-422827,来凤县,4,422800
-422828,鹤峰县,4,422800
-429004,仙桃市,4,429000
-429005,潜江市,4,429000
-429006,天门市,4,429000
-429021,神农架林区,4,429000
-430102,芙蓉区,4,430100
-430103,天心区,4,430100
-430104,岳麓区,4,430100
-430105,开福区,4,430100
-430111,雨花区,4,430100
-430112,望城区,4,430100
-430121,长沙县,4,430100
-430181,浏阳市,4,430100
-430182,宁乡市,4,430100
-430202,荷塘区,4,430200
-430203,芦淞区,4,430200
-430204,石峰区,4,430200
-430211,天元区,4,430200
-430212,渌口区,4,430200
-430223,攸县,4,430200
-430224,茶陵县,4,430200
-430225,炎陵县,4,430200
-430271,云龙示范区,4,430200
-430281,醴陵市,4,430200
-430302,雨湖区,4,430300
-430304,岳塘区,4,430300
-430321,湘潭县,4,430300
-430371,湖南湘潭高新技术产业园区,4,430300
-430372,湘潭昭山示范区,4,430300
-430373,湘潭九华示范区,4,430300
-430381,湘乡市,4,430300
-430382,韶山市,4,430300
-430405,珠晖区,4,430400
-430406,雁峰区,4,430400
-430407,石鼓区,4,430400
-430408,蒸湘区,4,430400
-430412,南岳区,4,430400
-430421,衡阳县,4,430400
-430422,衡南县,4,430400
-430423,衡山县,4,430400
-430424,衡东县,4,430400
-430426,祁东县,4,430400
-430471,衡阳综合保税区,4,430400
-430472,湖南衡阳高新技术产业园区,4,430400
-430473,湖南衡阳松木经济开发区,4,430400
-430481,耒阳市,4,430400
-430482,常宁市,4,430400
-430502,双清区,4,430500
-430503,大祥区,4,430500
-430511,北塔区,4,430500
-430522,新邵县,4,430500
-430523,邵阳县,4,430500
-430524,隆回县,4,430500
-430525,洞口县,4,430500
-430527,绥宁县,4,430500
-430528,新宁县,4,430500
-430529,城步苗族自治县,4,430500
-430581,武冈市,4,430500
-430582,邵东市,4,430500
-430602,岳阳楼区,4,430600
-430603,云溪区,4,430600
-430611,君山区,4,430600
-430621,岳阳县,4,430600
-430623,华容县,4,430600
-430624,湘阴县,4,430600
-430626,平江县,4,430600
-430671,岳阳市屈原管理区,4,430600
-430681,汨罗市,4,430600
-430682,临湘市,4,430600
-430702,武陵区,4,430700
-430703,鼎城区,4,430700
-430721,安乡县,4,430700
-430722,汉寿县,4,430700
-430723,澧县,4,430700
-430724,临澧县,4,430700
-430725,桃源县,4,430700
-430726,石门县,4,430700
-430771,常德市西洞庭管理区,4,430700
-430781,津市市,4,430700
-430802,永定区,4,430800
-430811,武陵源区,4,430800
-430821,慈利县,4,430800
-430822,桑植县,4,430800
-430902,资阳区,4,430900
-430903,赫山区,4,430900
-430921,南县,4,430900
-430922,桃江县,4,430900
-430923,安化县,4,430900
-430971,益阳市大通湖管理区,4,430900
-430972,湖南益阳高新技术产业园区,4,430900
-430981,沅江市,4,430900
-431002,北湖区,4,431000
-431003,苏仙区,4,431000
-431021,桂阳县,4,431000
-431022,宜章县,4,431000
-431023,永兴县,4,431000
-431024,嘉禾县,4,431000
-431025,临武县,4,431000
-431026,汝城县,4,431000
-431027,桂东县,4,431000
-431028,安仁县,4,431000
-431081,资兴市,4,431000
-431102,零陵区,4,431100
-431103,冷水滩区,4,431100
-431122,东安县,4,431100
-431123,双牌县,4,431100
-431124,道县,4,431100
-431125,江永县,4,431100
-431126,宁远县,4,431100
-431127,蓝山县,4,431100
-431128,新田县,4,431100
-431129,江华瑶族自治县,4,431100
-431171,永州经济技术开发区,4,431100
-431173,永州市回龙圩管理区,4,431100
-431181,祁阳市,4,431100
-431202,鹤城区,4,431200
-431221,中方县,4,431200
-431222,沅陵县,4,431200
-431223,辰溪县,4,431200
-431224,溆浦县,4,431200
-431225,会同县,4,431200
-431226,麻阳苗族自治县,4,431200
-431227,新晃侗族自治县,4,431200
-431228,芷江侗族自治县,4,431200
-431229,靖州苗族侗族自治县,4,431200
-431230,通道侗族自治县,4,431200
-431271,怀化市洪江管理区,4,431200
-431281,洪江市,4,431200
-431302,娄星区,4,431300
-431321,双峰县,4,431300
-431322,新化县,4,431300
-431381,冷水江市,4,431300
-431382,涟源市,4,431300
-433101,吉首市,4,433100
-433122,泸溪县,4,433100
-433123,凤凰县,4,433100
-433124,花垣县,4,433100
-433125,保靖县,4,433100
-433126,古丈县,4,433100
-433127,永顺县,4,433100
-433130,龙山县,4,433100
-440103,荔湾区,4,440100
-440104,越秀区,4,440100
-440105,海珠区,4,440100
-440106,天河区,4,440100
-440111,白云区,4,440100
-440112,黄埔区,4,440100
-440113,番禺区,4,440100
-440114,花都区,4,440100
-440115,南沙区,4,440100
-440117,从化区,4,440100
-440118,增城区,4,440100
-440203,武江区,4,440200
-440204,浈江区,4,440200
-440205,曲江区,4,440200
-440222,始兴县,4,440200
-440224,仁化县,4,440200
-440229,翁源县,4,440200
-440232,乳源瑶族自治县,4,440200
-440233,新丰县,4,440200
-440281,乐昌市,4,440200
-440282,南雄市,4,440200
-440303,罗湖区,4,440300
-440304,福田区,4,440300
-440305,南山区,4,440300
-440306,宝安区,4,440300
-440307,龙岗区,4,440300
-440308,盐田区,4,440300
-440309,龙华区,4,440300
-440310,坪山区,4,440300
-440311,光明区,4,440300
-440402,香洲区,4,440400
-440403,斗门区,4,440400
-440404,金湾区,4,440400
-440507,龙湖区,4,440500
-440511,金平区,4,440500
-440512,濠江区,4,440500
-440513,潮阳区,4,440500
-440514,潮南区,4,440500
-440515,澄海区,4,440500
-440523,南澳县,4,440500
-440604,禅城区,4,440600
-440605,南海区,4,440600
-440606,顺德区,4,440600
-440607,三水区,4,440600
-440608,高明区,4,440600
-440703,蓬江区,4,440700
-440704,江海区,4,440700
-440705,新会区,4,440700
-440781,台山市,4,440700
-440783,开平市,4,440700
-440784,鹤山市,4,440700
-440785,恩平市,4,440700
-440802,赤坎区,4,440800
-440803,霞山区,4,440800
-440804,坡头区,4,440800
-440811,麻章区,4,440800
-440823,遂溪县,4,440800
-440825,徐闻县,4,440800
-440881,廉江市,4,440800
-440882,雷州市,4,440800
-440883,吴川市,4,440800
-440902,茂南区,4,440900
-440904,电白区,4,440900
-440981,高州市,4,440900
-440982,化州市,4,440900
-440983,信宜市,4,440900
-441202,端州区,4,441200
-441203,鼎湖区,4,441200
-441204,高要区,4,441200
-441223,广宁县,4,441200
-441224,怀集县,4,441200
-441225,封开县,4,441200
-441226,德庆县,4,441200
-441284,四会市,4,441200
-441302,惠城区,4,441300
-441303,惠阳区,4,441300
-441322,博罗县,4,441300
-441323,惠东县,4,441300
-441324,龙门县,4,441300
-441402,梅江区,4,441400
-441403,梅县区,4,441400
-441422,大埔县,4,441400
-441423,丰顺县,4,441400
-441424,五华县,4,441400
-441426,平远县,4,441400
-441427,蕉岭县,4,441400
-441481,兴宁市,4,441400
-441502,城区,4,441500
-441521,海丰县,4,441500
-441523,陆河县,4,441500
-441581,陆丰市,4,441500
-441602,源城区,4,441600
-441621,紫金县,4,441600
-441622,龙川县,4,441600
-441623,连平县,4,441600
-441624,和平县,4,441600
-441625,东源县,4,441600
-441702,江城区,4,441700
-441704,阳东区,4,441700
-441721,阳西县,4,441700
-441781,阳春市,4,441700
-441802,清城区,4,441800
-441803,清新区,4,441800
-441821,佛冈县,4,441800
-441823,阳山县,4,441800
-441825,连山壮族瑶族自治县,4,441800
-441826,连南瑶族自治县,4,441800
-441881,英德市,4,441800
-441882,连州市,4,441800
-445102,湘桥区,4,445100
-445103,潮安区,4,445100
-445122,饶平县,4,445100
-445202,榕城区,4,445200
-445203,揭东区,4,445200
-445222,揭西县,4,445200
-445224,惠来县,4,445200
-445281,普宁市,4,445200
-445302,云城区,4,445300
-445303,云安区,4,445300
-445321,新兴县,4,445300
-445322,郁南县,4,445300
-445381,罗定市,4,445300
-450102,兴宁区,4,450100
-450103,青秀区,4,450100
-450105,江南区,4,450100
-450107,西乡塘区,4,450100
-450108,良庆区,4,450100
-450109,邕宁区,4,450100
-450110,武鸣区,4,450100
-450123,隆安县,4,450100
-450124,马山县,4,450100
-450125,上林县,4,450100
-450126,宾阳县,4,450100
-450181,横州市,4,450100
-450202,城中区,4,450200
-450203,鱼峰区,4,450200
-450204,柳南区,4,450200
-450205,柳北区,4,450200
-450206,柳江区,4,450200
-450222,柳城县,4,450200
-450223,鹿寨县,4,450200
-450224,融安县,4,450200
-450225,融水苗族自治县,4,450200
-450226,三江侗族自治县,4,450200
-450302,秀峰区,4,450300
-450303,叠彩区,4,450300
-450304,象山区,4,450300
-450305,七星区,4,450300
-450311,雁山区,4,450300
-450312,临桂区,4,450300
-450321,阳朔县,4,450300
-450323,灵川县,4,450300
-450324,全州县,4,450300
-450325,兴安县,4,450300
-450326,永福县,4,450300
-450327,灌阳县,4,450300
-450328,龙胜各族自治县,4,450300
-450329,资源县,4,450300
-450330,平乐县,4,450300
-450332,恭城瑶族自治县,4,450300
-450381,荔浦市,4,450300
-450403,万秀区,4,450400
-450405,长洲区,4,450400
-450406,龙圩区,4,450400
-450421,苍梧县,4,450400
-450422,藤县,4,450400
-450423,蒙山县,4,450400
-450481,岑溪市,4,450400
-450502,海城区,4,450500
-450503,银海区,4,450500
-450512,铁山港区,4,450500
-450521,合浦县,4,450500
-450602,港口区,4,450600
-450603,防城区,4,450600
-450621,上思县,4,450600
-450681,东兴市,4,450600
-450702,钦南区,4,450700
-450703,钦北区,4,450700
-450721,灵山县,4,450700
-450722,浦北县,4,450700
-450802,港北区,4,450800
-450803,港南区,4,450800
-450804,覃塘区,4,450800
-450821,平南县,4,450800
-450881,桂平市,4,450800
-450902,玉州区,4,450900
-450903,福绵区,4,450900
-450921,容县,4,450900
-450922,陆川县,4,450900
-450923,博白县,4,450900
-450924,兴业县,4,450900
-450981,北流市,4,450900
-451002,右江区,4,451000
-451003,田阳区,4,451000
-451022,田东县,4,451000
-451024,德保县,4,451000
-451026,那坡县,4,451000
-451027,凌云县,4,451000
-451028,乐业县,4,451000
-451029,田林县,4,451000
-451030,西林县,4,451000
-451031,隆林各族自治县,4,451000
-451081,靖西市,4,451000
-451082,平果市,4,451000
-451102,八步区,4,451100
-451103,平桂区,4,451100
-451121,昭平县,4,451100
-451122,钟山县,4,451100
-451123,富川瑶族自治县,4,451100
-451202,金城江区,4,451200
-451203,宜州区,4,451200
-451221,南丹县,4,451200
-451222,天峨县,4,451200
-451223,凤山县,4,451200
-451224,东兰县,4,451200
-451225,罗城仫佬族自治县,4,451200
-451226,环江毛南族自治县,4,451200
-451227,巴马瑶族自治县,4,451200
-451228,都安瑶族自治县,4,451200
-451229,大化瑶族自治县,4,451200
-451302,兴宾区,4,451300
-451321,忻城县,4,451300
-451322,象州县,4,451300
-451323,武宣县,4,451300
-451324,金秀瑶族自治县,4,451300
-451381,合山市,4,451300
-451402,江州区,4,451400
-451421,扶绥县,4,451400
-451422,宁明县,4,451400
-451423,龙州县,4,451400
-451424,大新县,4,451400
-451425,天等县,4,451400
-451481,凭祥市,4,451400
-460105,秀英区,4,460100
-460106,龙华区,4,460100
-460107,琼山区,4,460100
-460108,美兰区,4,460100
-460202,海棠区,4,460200
-460203,吉阳区,4,460200
-460204,天涯区,4,460200
-460205,崖州区,4,460200
-460321,西沙群岛,4,460300
-460322,南沙群岛,4,460300
-460323,中沙群岛的岛礁及其海域,4,460300
-469001,五指山市,4,469000
-469002,琼海市,4,469000
-469005,文昌市,4,469000
-469006,万宁市,4,469000
-469007,东方市,4,469000
-469021,定安县,4,469000
-469022,屯昌县,4,469000
-469023,澄迈县,4,469000
-469024,临高县,4,469000
-469025,白沙黎族自治县,4,469000
-469026,昌江黎族自治县,4,469000
-469027,乐东黎族自治县,4,469000
-469028,陵水黎族自治县,4,469000
-469029,保亭黎族苗族自治县,4,469000
-469030,琼中黎族苗族自治县,4,469000
-500101,万州区,4,500100
-500102,涪陵区,4,500100
-500103,渝中区,4,500100
-500104,大渡口区,4,500100
-500105,江北区,4,500100
-500106,沙坪坝区,4,500100
-500107,九龙坡区,4,500100
-500108,南岸区,4,500100
-500109,北碚区,4,500100
-500110,綦江区,4,500100
-500111,大足区,4,500100
-500112,渝北区,4,500100
-500113,巴南区,4,500100
-500114,黔江区,4,500100
-500115,长寿区,4,500100
-500116,江津区,4,500100
-500117,合川区,4,500100
-500118,永川区,4,500100
-500119,南川区,4,500100
-500120,璧山区,4,500100
-500151,铜梁区,4,500100
-500152,潼南区,4,500100
-500153,荣昌区,4,500100
-500154,开州区,4,500100
-500155,梁平区,4,500100
-500156,武隆区,4,500100
-500229,城口县,4,500100
-500230,丰都县,4,500100
-500231,垫江县,4,500100
-500233,忠县,4,500100
-500235,云阳县,4,500100
-500236,奉节县,4,500100
-500237,巫山县,4,500100
-500238,巫溪县,4,500100
-500240,石柱土家族自治县,4,500100
-500241,秀山土家族苗族自治县,4,500100
-500242,酉阳土家族苗族自治县,4,500100
-500243,彭水苗族土家族自治县,4,500100
-510104,锦江区,4,510100
-510105,青羊区,4,510100
-510106,金牛区,4,510100
-510107,武侯区,4,510100
-510108,成华区,4,510100
-510112,龙泉驿区,4,510100
-510113,青白江区,4,510100
-510114,新都区,4,510100
-510115,温江区,4,510100
-510116,双流区,4,510100
-510117,郫都区,4,510100
-510118,新津区,4,510100
-510121,金堂县,4,510100
-510129,大邑县,4,510100
-510131,蒲江县,4,510100
-510181,都江堰市,4,510100
-510182,彭州市,4,510100
-510183,邛崃市,4,510100
-510184,崇州市,4,510100
-510185,简阳市,4,510100
-510302,自流井区,4,510300
-510303,贡井区,4,510300
-510304,大安区,4,510300
-510311,沿滩区,4,510300
-510321,荣县,4,510300
-510322,富顺县,4,510300
-510402,东区,4,510400
-510403,西区,4,510400
-510411,仁和区,4,510400
-510421,米易县,4,510400
-510422,盐边县,4,510400
-510502,江阳区,4,510500
-510503,纳溪区,4,510500
-510504,龙马潭区,4,510500
-510521,泸县,4,510500
-510522,合江县,4,510500
-510524,叙永县,4,510500
-510525,古蔺县,4,510500
-510603,旌阳区,4,510600
-510604,罗江区,4,510600
-510623,中江县,4,510600
-510681,广汉市,4,510600
-510682,什邡市,4,510600
-510683,绵竹市,4,510600
-510703,涪城区,4,510700
-510704,游仙区,4,510700
-510705,安州区,4,510700
-510722,三台县,4,510700
-510723,盐亭县,4,510700
-510725,梓潼县,4,510700
-510726,北川羌族自治县,4,510700
-510727,平武县,4,510700
-510781,江油市,4,510700
-510802,利州区,4,510800
-510811,昭化区,4,510800
-510812,朝天区,4,510800
-510821,旺苍县,4,510800
-510822,青川县,4,510800
-510823,剑阁县,4,510800
-510824,苍溪县,4,510800
-510903,船山区,4,510900
-510904,安居区,4,510900
-510921,蓬溪县,4,510900
-510923,大英县,4,510900
-510981,射洪市,4,510900
-511002,市中区,4,511000
-511011,东兴区,4,511000
-511024,威远县,4,511000
-511025,资中县,4,511000
-511071,内江经济开发区,4,511000
-511083,隆昌市,4,511000
-511102,市中区,4,511100
-511111,沙湾区,4,511100
-511112,五通桥区,4,511100
-511113,金口河区,4,511100
-511123,犍为县,4,511100
-511124,井研县,4,511100
-511126,夹江县,4,511100
-511129,沐川县,4,511100
-511132,峨边彝族自治县,4,511100
-511133,马边彝族自治县,4,511100
-511181,峨眉山市,4,511100
-511302,顺庆区,4,511300
-511303,高坪区,4,511300
-511304,嘉陵区,4,511300
-511321,南部县,4,511300
-511322,营山县,4,511300
-511323,蓬安县,4,511300
-511324,仪陇县,4,511300
-511325,西充县,4,511300
-511381,阆中市,4,511300
-511402,东坡区,4,511400
-511403,彭山区,4,511400
-511421,仁寿县,4,511400
-511423,洪雅县,4,511400
-511424,丹棱县,4,511400
-511425,青神县,4,511400
-511502,翠屏区,4,511500
-511503,南溪区,4,511500
-511504,叙州区,4,511500
-511523,江安县,4,511500
-511524,长宁县,4,511500
-511525,高县,4,511500
-511526,珙县,4,511500
-511527,筠连县,4,511500
-511528,兴文县,4,511500
-511529,屏山县,4,511500
-511602,广安区,4,511600
-511603,前锋区,4,511600
-511621,岳池县,4,511600
-511622,武胜县,4,511600
-511623,邻水县,4,511600
-511681,华蓥市,4,511600
-511702,通川区,4,511700
-511703,达川区,4,511700
-511722,宣汉县,4,511700
-511723,开江县,4,511700
-511724,大竹县,4,511700
-511725,渠县,4,511700
-511771,达州经济开发区,4,511700
-511781,万源市,4,511700
-511802,雨城区,4,511800
-511803,名山区,4,511800
-511822,荥经县,4,511800
-511823,汉源县,4,511800
-511824,石棉县,4,511800
-511825,天全县,4,511800
-511826,芦山县,4,511800
-511827,宝兴县,4,511800
-511902,巴州区,4,511900
-511903,恩阳区,4,511900
-511921,通江县,4,511900
-511922,南江县,4,511900
-511923,平昌县,4,511900
-511971,巴中经济开发区,4,511900
-512002,雁江区,4,512000
-512021,安岳县,4,512000
-512022,乐至县,4,512000
-513201,马尔康市,4,513200
-513221,汶川县,4,513200
-513222,理县,4,513200
-513223,茂县,4,513200
-513224,松潘县,4,513200
-513225,九寨沟县,4,513200
-513226,金川县,4,513200
-513227,小金县,4,513200
-513228,黑水县,4,513200
-513230,壤塘县,4,513200
-513231,阿坝县,4,513200
-513232,若尔盖县,4,513200
-513233,红原县,4,513200
-513301,康定市,4,513300
-513322,泸定县,4,513300
-513323,丹巴县,4,513300
-513324,九龙县,4,513300
-513325,雅江县,4,513300
-513326,道孚县,4,513300
-513327,炉霍县,4,513300
-513328,甘孜县,4,513300
-513329,新龙县,4,513300
-513330,德格县,4,513300
-513331,白玉县,4,513300
-513332,石渠县,4,513300
-513333,色达县,4,513300
-513334,理塘县,4,513300
-513335,巴塘县,4,513300
-513336,乡城县,4,513300
-513337,稻城县,4,513300
-513338,得荣县,4,513300
-513401,西昌市,4,513400
-513402,会理市,4,513400
-513422,木里藏族自治县,4,513400
-513423,盐源县,4,513400
-513424,德昌县,4,513400
-513426,会东县,4,513400
-513427,宁南县,4,513400
-513428,普格县,4,513400
-513429,布拖县,4,513400
-513430,金阳县,4,513400
-513431,昭觉县,4,513400
-513432,喜德县,4,513400
-513433,冕宁县,4,513400
-513434,越西县,4,513400
-513435,甘洛县,4,513400
-513436,美姑县,4,513400
-513437,雷波县,4,513400
-520102,南明区,4,520100
-520103,云岩区,4,520100
-520111,花溪区,4,520100
-520112,乌当区,4,520100
-520113,白云区,4,520100
-520115,观山湖区,4,520100
-520121,开阳县,4,520100
-520122,息烽县,4,520100
-520123,修文县,4,520100
-520181,清镇市,4,520100
-520201,钟山区,4,520200
-520203,六枝特区,4,520200
-520204,水城区,4,520200
-520281,盘州市,4,520200
-520302,红花岗区,4,520300
-520303,汇川区,4,520300
-520304,播州区,4,520300
-520322,桐梓县,4,520300
-520323,绥阳县,4,520300
-520324,正安县,4,520300
-520325,道真仡佬族苗族自治县,4,520300
-520326,务川仡佬族苗族自治县,4,520300
-520327,凤冈县,4,520300
-520328,湄潭县,4,520300
-520329,余庆县,4,520300
-520330,习水县,4,520300
-520381,赤水市,4,520300
-520382,仁怀市,4,520300
-520402,西秀区,4,520400
-520403,平坝区,4,520400
-520422,普定县,4,520400
-520423,镇宁布依族苗族自治县,4,520400
-520424,关岭布依族苗族自治县,4,520400
-520425,紫云苗族布依族自治县,4,520400
-520502,七星关区,4,520500
-520521,大方县,4,520500
-520523,金沙县,4,520500
-520524,织金县,4,520500
-520525,纳雍县,4,520500
-520526,威宁彝族回族苗族自治县,4,520500
-520527,赫章县,4,520500
-520581,黔西市,4,520500
-520602,碧江区,4,520600
-520603,万山区,4,520600
-520621,江口县,4,520600
-520622,玉屏侗族自治县,4,520600
-520623,石阡县,4,520600
-520624,思南县,4,520600
-520625,印江土家族苗族自治县,4,520600
-520626,德江县,4,520600
-520627,沿河土家族自治县,4,520600
-520628,松桃苗族自治县,4,520600
-522301,兴义市,4,522300
-522302,兴仁市,4,522300
-522323,普安县,4,522300
-522324,晴隆县,4,522300
-522325,贞丰县,4,522300
-522326,望谟县,4,522300
-522327,册亨县,4,522300
-522328,安龙县,4,522300
-522601,凯里市,4,522600
-522622,黄平县,4,522600
-522623,施秉县,4,522600
-522624,三穗县,4,522600
-522625,镇远县,4,522600
-522626,岑巩县,4,522600
-522627,天柱县,4,522600
-522628,锦屏县,4,522600
-522629,剑河县,4,522600
-522630,台江县,4,522600
-522631,黎平县,4,522600
-522632,榕江县,4,522600
-522633,从江县,4,522600
-522634,雷山县,4,522600
-522635,麻江县,4,522600
-522636,丹寨县,4,522600
-522701,都匀市,4,522700
-522702,福泉市,4,522700
-522722,荔波县,4,522700
-522723,贵定县,4,522700
-522725,瓮安县,4,522700
-522726,独山县,4,522700
-522727,平塘县,4,522700
-522728,罗甸县,4,522700
-522729,长顺县,4,522700
-522730,龙里县,4,522700
-522731,惠水县,4,522700
-522732,三都水族自治县,4,522700
-530102,五华区,4,530100
-530103,盘龙区,4,530100
-530111,官渡区,4,530100
-530112,西山区,4,530100
-530113,东川区,4,530100
-530114,呈贡区,4,530100
-530115,晋宁区,4,530100
-530124,富民县,4,530100
-530125,宜良县,4,530100
-530126,石林彝族自治县,4,530100
-530127,嵩明县,4,530100
-530128,禄劝彝族苗族自治县,4,530100
-530129,寻甸回族彝族自治县,4,530100
-530181,安宁市,4,530100
-530302,麒麟区,4,530300
-530303,沾益区,4,530300
-530304,马龙区,4,530300
-530322,陆良县,4,530300
-530323,师宗县,4,530300
-530324,罗平县,4,530300
-530325,富源县,4,530300
-530326,会泽县,4,530300
-530381,宣威市,4,530300
-530402,红塔区,4,530400
-530403,江川区,4,530400
-530423,通海县,4,530400
-530424,华宁县,4,530400
-530425,易门县,4,530400
-530426,峨山彝族自治县,4,530400
-530427,新平彝族傣族自治县,4,530400
-530428,元江哈尼族彝族傣族自治县,4,530400
-530481,澄江市,4,530400
-530502,隆阳区,4,530500
-530521,施甸县,4,530500
-530523,龙陵县,4,530500
-530524,昌宁县,4,530500
-530581,腾冲市,4,530500
-530602,昭阳区,4,530600
-530621,鲁甸县,4,530600
-530622,巧家县,4,530600
-530623,盐津县,4,530600
-530624,大关县,4,530600
-530625,永善县,4,530600
-530626,绥江县,4,530600
-530627,镇雄县,4,530600
-530628,彝良县,4,530600
-530629,威信县,4,530600
-530681,水富市,4,530600
-530702,古城区,4,530700
-530721,玉龙纳西族自治县,4,530700
-530722,永胜县,4,530700
-530723,华坪县,4,530700
-530724,宁蒗彝族自治县,4,530700
-530802,思茅区,4,530800
-530821,宁洱哈尼族彝族自治县,4,530800
-530822,墨江哈尼族自治县,4,530800
-530823,景东彝族自治县,4,530800
-530824,景谷傣族彝族自治县,4,530800
-530825,镇沅彝族哈尼族拉祜族自治县,4,530800
-530826,江城哈尼族彝族自治县,4,530800
-530827,孟连傣族拉祜族佤族自治县,4,530800
-530828,澜沧拉祜族自治县,4,530800
-530829,西盟佤族自治县,4,530800
-530902,临翔区,4,530900
-530921,凤庆县,4,530900
-530922,云县,4,530900
-530923,永德县,4,530900
-530924,镇康县,4,530900
-530925,双江拉祜族佤族布朗族傣族自治县,4,530900
-530926,耿马傣族佤族自治县,4,530900
-530927,沧源佤族自治县,4,530900
-532301,楚雄市,4,532300
-532302,禄丰市,4,532300
-532322,双柏县,4,532300
-532323,牟定县,4,532300
-532324,南华县,4,532300
-532325,姚安县,4,532300
-532326,大姚县,4,532300
-532327,永仁县,4,532300
-532328,元谋县,4,532300
-532329,武定县,4,532300
-532501,个旧市,4,532500
-532502,开远市,4,532500
-532503,蒙自市,4,532500
-532504,弥勒市,4,532500
-532523,屏边苗族自治县,4,532500
-532524,建水县,4,532500
-532525,石屏县,4,532500
-532527,泸西县,4,532500
-532528,元阳县,4,532500
-532529,红河县,4,532500
-532530,金平苗族瑶族傣族自治县,4,532500
-532531,绿春县,4,532500
-532532,河口瑶族自治县,4,532500
-532601,文山市,4,532600
-532622,砚山县,4,532600
-532623,西畴县,4,532600
-532624,麻栗坡县,4,532600
-532625,马关县,4,532600
-532626,丘北县,4,532600
-532627,广南县,4,532600
-532628,富宁县,4,532600
-532801,景洪市,4,532800
-532822,勐海县,4,532800
-532823,勐腊县,4,532800
-532901,大理市,4,532900
-532922,漾濞彝族自治县,4,532900
-532923,祥云县,4,532900
-532924,宾川县,4,532900
-532925,弥渡县,4,532900
-532926,南涧彝族自治县,4,532900
-532927,巍山彝族回族自治县,4,532900
-532928,永平县,4,532900
-532929,云龙县,4,532900
-532930,洱源县,4,532900
-532931,剑川县,4,532900
-532932,鹤庆县,4,532900
-533102,瑞丽市,4,533100
-533103,芒市,4,533100
-533122,梁河县,4,533100
-533123,盈江县,4,533100
-533124,陇川县,4,533100
-533301,泸水市,4,533300
-533323,福贡县,4,533300
-533324,贡山独龙族怒族自治县,4,533300
-533325,兰坪白族普米族自治县,4,533300
-533401,香格里拉市,4,533400
-533422,德钦县,4,533400
-533423,维西傈僳族自治县,4,533400
-540102,城关区,4,540100
-540103,堆龙德庆区,4,540100
-540104,达孜区,4,540100
-540121,林周县,4,540100
-540122,当雄县,4,540100
-540123,尼木县,4,540100
-540124,曲水县,4,540100
-540127,墨竹工卡县,4,540100
-540171,格尔木藏青工业园区,4,540100
-540172,拉萨经济技术开发区,4,540100
-540173,西藏文化旅游创意园区,4,540100
-540174,达孜工业园区,4,540100
-540202,桑珠孜区,4,540200
-540221,南木林县,4,540200
-540222,江孜县,4,540200
-540223,定日县,4,540200
-540224,萨迦县,4,540200
-540225,拉孜县,4,540200
-540226,昂仁县,4,540200
-540227,谢通门县,4,540200
-540228,白朗县,4,540200
-540229,仁布县,4,540200
-540230,康马县,4,540200
-540231,定结县,4,540200
-540232,仲巴县,4,540200
-540233,亚东县,4,540200
-540234,吉隆县,4,540200
-540235,聂拉木县,4,540200
-540236,萨嘎县,4,540200
-540237,岗巴县,4,540200
-540302,卡若区,4,540300
-540321,江达县,4,540300
-540322,贡觉县,4,540300
-540323,类乌齐县,4,540300
-540324,丁青县,4,540300
-540325,察雅县,4,540300
-540326,八宿县,4,540300
-540327,左贡县,4,540300
-540328,芒康县,4,540300
-540329,洛隆县,4,540300
-540330,边坝县,4,540300
-540402,巴宜区,4,540400
-540421,工布江达县,4,540400
-540422,米林县,4,540400
-540423,墨脱县,4,540400
-540424,波密县,4,540400
-540425,察隅县,4,540400
-540426,朗县,4,540400
-540502,乃东区,4,540500
-540521,扎囊县,4,540500
-540522,贡嘎县,4,540500
-540523,桑日县,4,540500
-540524,琼结县,4,540500
-540525,曲松县,4,540500
-540526,措美县,4,540500
-540527,洛扎县,4,540500
-540528,加查县,4,540500
-540529,隆子县,4,540500
-540530,错那县,4,540500
-540531,浪卡子县,4,540500
-540602,色尼区,4,540600
-540621,嘉黎县,4,540600
-540622,比如县,4,540600
-540623,聂荣县,4,540600
-540624,安多县,4,540600
-540625,申扎县,4,540600
-540626,索县,4,540600
-540627,班戈县,4,540600
-540628,巴青县,4,540600
-540629,尼玛县,4,540600
-540630,双湖县,4,540600
-542521,普兰县,4,542500
-542522,札达县,4,542500
-542523,噶尔县,4,542500
-542524,日土县,4,542500
-542525,革吉县,4,542500
-542526,改则县,4,542500
-542527,措勤县,4,542500
-610102,新城区,4,610100
-610103,碑林区,4,610100
-610104,莲湖区,4,610100
-610111,灞桥区,4,610100
-610112,未央区,4,610100
-610113,雁塔区,4,610100
-610114,阎良区,4,610100
-610115,临潼区,4,610100
-610116,长安区,4,610100
-610117,高陵区,4,610100
-610118,鄠邑区,4,610100
-610122,蓝田县,4,610100
-610124,周至县,4,610100
-610202,王益区,4,610200
-610203,印台区,4,610200
-610204,耀州区,4,610200
-610222,宜君县,4,610200
-610302,渭滨区,4,610300
-610303,金台区,4,610300
-610304,陈仓区,4,610300
-610305,凤翔区,4,610300
-610323,岐山县,4,610300
-610324,扶风县,4,610300
-610326,眉县,4,610300
-610327,陇县,4,610300
-610328,千阳县,4,610300
-610329,麟游县,4,610300
-610330,凤县,4,610300
-610331,太白县,4,610300
-610402,秦都区,4,610400
-610403,杨陵区,4,610400
-610404,渭城区,4,610400
-610422,三原县,4,610400
-610423,泾阳县,4,610400
-610424,乾县,4,610400
-610425,礼泉县,4,610400
-610426,永寿县,4,610400
-610428,长武县,4,610400
-610429,旬邑县,4,610400
-610430,淳化县,4,610400
-610431,武功县,4,610400
-610481,兴平市,4,610400
-610482,彬州市,4,610400
-610502,临渭区,4,610500
-610503,华州区,4,610500
-610522,潼关县,4,610500
-610523,大荔县,4,610500
-610524,合阳县,4,610500
-610525,澄城县,4,610500
-610526,蒲城县,4,610500
-610527,白水县,4,610500
-610528,富平县,4,610500
-610581,韩城市,4,610500
-610582,华阴市,4,610500
-610602,宝塔区,4,610600
-610603,安塞区,4,610600
-610621,延长县,4,610600
-610622,延川县,4,610600
-610625,志丹县,4,610600
-610626,吴起县,4,610600
-610627,甘泉县,4,610600
-610628,富县,4,610600
-610629,洛川县,4,610600
-610630,宜川县,4,610600
-610631,黄龙县,4,610600
-610632,黄陵县,4,610600
-610681,子长市,4,610600
-610702,汉台区,4,610700
-610703,南郑区,4,610700
-610722,城固县,4,610700
-610723,洋县,4,610700
-610724,西乡县,4,610700
-610725,勉县,4,610700
-610726,宁强县,4,610700
-610727,略阳县,4,610700
-610728,镇巴县,4,610700
-610729,留坝县,4,610700
-610730,佛坪县,4,610700
-610802,榆阳区,4,610800
-610803,横山区,4,610800
-610822,府谷县,4,610800
-610824,靖边县,4,610800
-610825,定边县,4,610800
-610826,绥德县,4,610800
-610827,米脂县,4,610800
-610828,佳县,4,610800
-610829,吴堡县,4,610800
-610830,清涧县,4,610800
-610831,子洲县,4,610800
-610881,神木市,4,610800
-610902,汉滨区,4,610900
-610921,汉阴县,4,610900
-610922,石泉县,4,610900
-610923,宁陕县,4,610900
-610924,紫阳县,4,610900
-610925,岚皋县,4,610900
-610926,平利县,4,610900
-610927,镇坪县,4,610900
-610929,白河县,4,610900
-610981,旬阳市,4,610900
-611002,商州区,4,611000
-611021,洛南县,4,611000
-611022,丹凤县,4,611000
-611023,商南县,4,611000
-611024,山阳县,4,611000
-611025,镇安县,4,611000
-611026,柞水县,4,611000
-620102,城关区,4,620100
-620103,七里河区,4,620100
-620104,西固区,4,620100
-620105,安宁区,4,620100
-620111,红古区,4,620100
-620121,永登县,4,620100
-620122,皋兰县,4,620100
-620123,榆中县,4,620100
-620171,兰州新区,4,620100
-620201,嘉峪关市,4,620200
-620302,金川区,4,620300
-620321,永昌县,4,620300
-620402,白银区,4,620400
-620403,平川区,4,620400
-620421,靖远县,4,620400
-620422,会宁县,4,620400
-620423,景泰县,4,620400
-620502,秦州区,4,620500
-620503,麦积区,4,620500
-620521,清水县,4,620500
-620522,秦安县,4,620500
-620523,甘谷县,4,620500
-620524,武山县,4,620500
-620525,张家川回族自治县,4,620500
-620602,凉州区,4,620600
-620621,民勤县,4,620600
-620622,古浪县,4,620600
-620623,天祝藏族自治县,4,620600
-620702,甘州区,4,620700
-620721,肃南裕固族自治县,4,620700
-620722,民乐县,4,620700
-620723,临泽县,4,620700
-620724,高台县,4,620700
-620725,山丹县,4,620700
-620802,崆峒区,4,620800
-620821,泾川县,4,620800
-620822,灵台县,4,620800
-620823,崇信县,4,620800
-620825,庄浪县,4,620800
-620826,静宁县,4,620800
-620881,华亭市,4,620800
-620902,肃州区,4,620900
-620921,金塔县,4,620900
-620922,瓜州县,4,620900
-620923,肃北蒙古族自治县,4,620900
-620924,阿克塞哈萨克族自治县,4,620900
-620981,玉门市,4,620900
-620982,敦煌市,4,620900
-621002,西峰区,4,621000
-621021,庆城县,4,621000
-621022,环县,4,621000
-621023,华池县,4,621000
-621024,合水县,4,621000
-621025,正宁县,4,621000
-621026,宁县,4,621000
-621027,镇原县,4,621000
-621102,安定区,4,621100
-621121,通渭县,4,621100
-621122,陇西县,4,621100
-621123,渭源县,4,621100
-621124,临洮县,4,621100
-621125,漳县,4,621100
-621126,岷县,4,621100
-621202,武都区,4,621200
-621221,成县,4,621200
-621222,文县,4,621200
-621223,宕昌县,4,621200
-621224,康县,4,621200
-621225,西和县,4,621200
-621226,礼县,4,621200
-621227,徽县,4,621200
-621228,两当县,4,621200
-622901,临夏市,4,622900
-622921,临夏县,4,622900
-622922,康乐县,4,622900
-622923,永靖县,4,622900
-622924,广河县,4,622900
-622925,和政县,4,622900
-622926,东乡族自治县,4,622900
-622927,积石山保安族东乡族撒拉族自治县,4,622900
-623001,合作市,4,623000
-623021,临潭县,4,623000
-623022,卓尼县,4,623000
-623023,舟曲县,4,623000
-623024,迭部县,4,623000
-623025,玛曲县,4,623000
-623026,碌曲县,4,623000
-623027,夏河县,4,623000
-630102,城东区,4,630100
-630103,城中区,4,630100
-630104,城西区,4,630100
-630105,城北区,4,630100
-630106,湟中区,4,630100
-630121,大通回族土族自治县,4,630100
-630123,湟源县,4,630100
-630202,乐都区,4,630200
-630203,平安区,4,630200
-630222,民和回族土族自治县,4,630200
-630223,互助土族自治县,4,630200
-630224,化隆回族自治县,4,630200
-630225,循化撒拉族自治县,4,630200
-632221,门源回族自治县,4,632200
-632222,祁连县,4,632200
-632223,海晏县,4,632200
-632224,刚察县,4,632200
-632301,同仁市,4,632300
-632322,尖扎县,4,632300
-632323,泽库县,4,632300
-632324,河南蒙古族自治县,4,632300
-632521,共和县,4,632500
-632522,同德县,4,632500
-632523,贵德县,4,632500
-632524,兴海县,4,632500
-632525,贵南县,4,632500
-632621,玛沁县,4,632600
-632622,班玛县,4,632600
-632623,甘德县,4,632600
-632624,达日县,4,632600
-632625,久治县,4,632600
-632626,玛多县,4,632600
-632701,玉树市,4,632700
-632722,杂多县,4,632700
-632723,称多县,4,632700
-632724,治多县,4,632700
-632725,囊谦县,4,632700
-632726,曲麻莱县,4,632700
-632801,格尔木市,4,632800
-632802,德令哈市,4,632800
-632803,茫崖市,4,632800
-632821,乌兰县,4,632800
-632822,都兰县,4,632800
-632823,天峻县,4,632800
-632857,大柴旦行政委员会,4,632800
-640104,兴庆区,4,640100
-640105,西夏区,4,640100
-640106,金凤区,4,640100
-640121,永宁县,4,640100
-640122,贺兰县,4,640100
-640181,灵武市,4,640100
-640202,大武口区,4,640200
-640205,惠农区,4,640200
-640221,平罗县,4,640200
-640302,利通区,4,640300
-640303,红寺堡区,4,640300
-640323,盐池县,4,640300
-640324,同心县,4,640300
-640381,青铜峡市,4,640300
-640402,原州区,4,640400
-640422,西吉县,4,640400
-640423,隆德县,4,640400
-640424,泾源县,4,640400
-640425,彭阳县,4,640400
-640502,沙坡头区,4,640500
-640521,中宁县,4,640500
-640522,海原县,4,640500
-650102,天山区,4,650100
-650103,沙依巴克区,4,650100
-650104,新市区,4,650100
-650105,水磨沟区,4,650100
-650106,头屯河区,4,650100
-650107,达坂城区,4,650100
-650109,米东区,4,650100
-650121,乌鲁木齐县,4,650100
-650202,独山子区,4,650200
-650203,克拉玛依区,4,650200
-650204,白碱滩区,4,650200
-650205,乌尔禾区,4,650200
-650402,高昌区,4,650400
-650421,鄯善县,4,650400
-650422,托克逊县,4,650400
-650502,伊州区,4,650500
-650521,巴里坤哈萨克自治县,4,650500
-650522,伊吾县,4,650500
-652301,昌吉市,4,652300
-652302,阜康市,4,652300
-652323,呼图壁县,4,652300
-652324,玛纳斯县,4,652300
-652325,奇台县,4,652300
-652327,吉木萨尔县,4,652300
-652328,木垒哈萨克自治县,4,652300
-652701,博乐市,4,652700
-652702,阿拉山口市,4,652700
-652722,精河县,4,652700
-652723,温泉县,4,652700
-652801,库尔勒市,4,652800
-652822,轮台县,4,652800
-652823,尉犁县,4,652800
-652824,若羌县,4,652800
-652825,且末县,4,652800
-652826,焉耆回族自治县,4,652800
-652827,和静县,4,652800
-652828,和硕县,4,652800
-652829,博湖县,4,652800
-652871,库尔勒经济技术开发区,4,652800
-652901,阿克苏市,4,652900
-652902,库车市,4,652900
-652922,温宿县,4,652900
-652924,沙雅县,4,652900
-652925,新和县,4,652900
-652926,拜城县,4,652900
-652927,乌什县,4,652900
-652928,阿瓦提县,4,652900
-652929,柯坪县,4,652900
-653001,阿图什市,4,653000
-653022,阿克陶县,4,653000
-653023,阿合奇县,4,653000
-653024,乌恰县,4,653000
-653101,喀什市,4,653100
-653121,疏附县,4,653100
-653122,疏勒县,4,653100
-653123,英吉沙县,4,653100
-653124,泽普县,4,653100
-653125,莎车县,4,653100
-653126,叶城县,4,653100
-653127,麦盖提县,4,653100
-653128,岳普湖县,4,653100
-653129,伽师县,4,653100
-653130,巴楚县,4,653100
-653131,塔什库尔干塔吉克自治县,4,653100
-653201,和田市,4,653200
-653221,和田县,4,653200
-653222,墨玉县,4,653200
-653223,皮山县,4,653200
-653224,洛浦县,4,653200
-653225,策勒县,4,653200
-653226,于田县,4,653200
-653227,民丰县,4,653200
-654002,伊宁市,4,654000
-654003,奎屯市,4,654000
-654004,霍尔果斯市,4,654000
-654021,伊宁县,4,654000
-654022,察布查尔锡伯自治县,4,654000
-654023,霍城县,4,654000
-654024,巩留县,4,654000
-654025,新源县,4,654000
-654026,昭苏县,4,654000
-654027,特克斯县,4,654000
-654028,尼勒克县,4,654000
-654201,塔城市,4,654200
-654202,乌苏市,4,654200
-654203,沙湾市,4,654200
-654221,额敏县,4,654200
-654224,托里县,4,654200
-654225,裕民县,4,654200
-654226,和布克赛尔蒙古自治县,4,654200
-654301,阿勒泰市,4,654300
-654321,布尔津县,4,654300
-654322,富蕴县,4,654300
-654323,福海县,4,654300
-654324,哈巴河县,4,654300
-654325,青河县,4,654300
-654326,吉木乃县,4,654300
-659001,石河子市,4,659000
-659002,阿拉尔市,4,659000
-659003,图木舒克市,4,659000
-659004,五家渠市,4,659000
-659005,北屯市,4,659000
-659006,铁门关市,4,659000
-659007,双河市,4,659000
-659008,可克达拉市,4,659000
-659009,昆玉市,4,659000
-659010,胡杨河市,4,659000
-659011,新星市,4,659000
\ No newline at end of file
diff --git a/hangtag-framework/hangtag-spring-boot-starter-biz-ip/target/classes/ip2region.xdb b/hangtag-framework/hangtag-spring-boot-starter-biz-ip/target/classes/ip2region.xdb
deleted file mode 100644
index 58596a5..0000000
Binary files a/hangtag-framework/hangtag-spring-boot-starter-biz-ip/target/classes/ip2region.xdb and /dev/null differ
diff --git a/hangtag-framework/hangtag-spring-boot-starter-biz-tenant/target/classes/META-INF/spring-configuration-metadata.json b/hangtag-framework/hangtag-spring-boot-starter-biz-tenant/target/classes/META-INF/spring-configuration-metadata.json
deleted file mode 100644
index 7944cf6..0000000
--- a/hangtag-framework/hangtag-spring-boot-starter-biz-tenant/target/classes/META-INF/spring-configuration-metadata.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "groups": [
-    {
-      "name": "hangtag.tenant",
-      "type": "cn.hangtag.framework.tenant.config.TenantProperties",
-      "sourceType": "cn.hangtag.framework.tenant.config.TenantProperties"
-    }
-  ],
-  "properties": [
-    {
-      "name": "hangtag.tenant.enable",
-      "type": "java.lang.Boolean",
-      "description": "是否开启",
-      "sourceType": "cn.hangtag.framework.tenant.config.TenantProperties"
-    },
-    {
-      "name": "hangtag.tenant.ignore-tables",
-      "type": "java.util.Set<java.lang.String>",
-      "description": "需要忽略多租户的表 即默认所有表都开启多租户的功能，所以记得添加对应的 tenant_id 字段哟",
-      "sourceType": "cn.hangtag.framework.tenant.config.TenantProperties"
-    },
-    {
-      "name": "hangtag.tenant.ignore-urls",
-      "type": "java.util.Set<java.lang.String>",
-      "description": "需要忽略多租户的请求 默认情况下，每个请求需要带上 tenant-id 的请求头。但是，部分请求是无需带上的，例如说短信回调、支付回调等 Open API！",
-      "sourceType": "cn.hangtag.framework.tenant.config.TenantProperties"
-    }
-  ],
-  "hints": []
-}
\ No newline at end of file
diff --git a/hangtag-framework/hangtag-spring-boot-starter-biz-tenant/target/classes/META-INF/spring.factories b/hangtag-framework/hangtag-spring-boot-starter-biz-tenant/target/classes/META-INF/spring.factories
deleted file mode 100644
index 7a181c6..0000000
--- a/hangtag-framework/hangtag-spring-boot-starter-biz-tenant/target/classes/META-INF/spring.factories
+++ /dev/null
@@ -1,2 +0,0 @@
-org.springframework.boot.env.EnvironmentPostProcessor=\
-  cn.hangtag.framework.tenant.core.mq.kafka.TenantKafkaEnvironmentPostProcessor
diff --git a/hangtag-framework/hangtag-spring-boot-starter-biz-tenant/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/hangtag-framework/hangtag-spring-boot-starter-biz-tenant/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 4f60a5b..0000000
--- a/hangtag-framework/hangtag-spring-boot-starter-biz-tenant/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-cn.hangtag.framework.tenant.config.HangtagTenantAutoConfiguration
\ No newline at end of file
diff --git a/hangtag-framework/hangtag-spring-boot-starter-excel/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/hangtag-framework/hangtag-spring-boot-starter-excel/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 1adb613..0000000
--- a/hangtag-framework/hangtag-spring-boot-starter-excel/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-cn.hangtag.framework.dict.config.HangtagDictAutoConfiguration
\ No newline at end of file
diff --git a/hangtag-framework/hangtag-spring-boot-starter-job/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/hangtag-framework/hangtag-spring-boot-starter-job/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 7645e71..0000000
--- a/hangtag-framework/hangtag-spring-boot-starter-job/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1,2 +0,0 @@
-cn.hangtag.framework.quartz.config.HangtagQuartzAutoConfiguration
-cn.hangtag.framework.quartz.config.HangtagAsyncAutoConfiguration
\ No newline at end of file
diff --git a/hangtag-framework/hangtag-spring-boot-starter-monitor/target/classes/META-INF/spring-configuration-metadata.json b/hangtag-framework/hangtag-spring-boot-starter-monitor/target/classes/META-INF/spring-configuration-metadata.json
deleted file mode 100644
index 7beb87e..0000000
--- a/hangtag-framework/hangtag-spring-boot-starter-monitor/target/classes/META-INF/spring-configuration-metadata.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "groups": [
-    {
-      "name": "hangtag.tracer",
-      "type": "cn.hangtag.framework.tracer.config.TracerProperties",
-      "sourceType": "cn.hangtag.framework.tracer.config.TracerProperties"
-    }
-  ],
-  "properties": [],
-  "hints": []
-}
\ No newline at end of file
diff --git a/hangtag-framework/hangtag-spring-boot-starter-monitor/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/hangtag-framework/hangtag-spring-boot-starter-monitor/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 3e117d9..0000000
--- a/hangtag-framework/hangtag-spring-boot-starter-monitor/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1,2 +0,0 @@
-cn.hangtag.framework.tracer.config.HangtagTracerAutoConfiguration
-cn.hangtag.framework.tracer.config.HangtagMetricsAutoConfiguration
\ No newline at end of file
diff --git a/hangtag-framework/hangtag-spring-boot-starter-mq/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/hangtag-framework/hangtag-spring-boot-starter-mq/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index daa69ad..0000000
--- a/hangtag-framework/hangtag-spring-boot-starter-mq/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1,3 +0,0 @@
-cn.hangtag.framework.mq.redis.config.HangtagRedisMQProducerAutoConfiguration
-cn.hangtag.framework.mq.redis.config.HangtagRedisMQConsumerAutoConfiguration
-cn.hangtag.framework.mq.rabbitmq.config.HangtagRabbitMQAutoConfiguration
\ No newline at end of file
diff --git a/hangtag-framework/hangtag-spring-boot-starter-mybatis/target/classes/META-INF/spring.factories b/hangtag-framework/hangtag-spring-boot-starter-mybatis/target/classes/META-INF/spring.factories
deleted file mode 100644
index 8293959..0000000
--- a/hangtag-framework/hangtag-spring-boot-starter-mybatis/target/classes/META-INF/spring.factories
+++ /dev/null
@@ -1,2 +0,0 @@
-org.springframework.boot.env.EnvironmentPostProcessor=\
-  cn.hangtag.framework.mybatis.config.IdTypeEnvironmentPostProcessor
diff --git a/hangtag-framework/hangtag-spring-boot-starter-mybatis/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/hangtag-framework/hangtag-spring-boot-starter-mybatis/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index c5731c5..0000000
--- a/hangtag-framework/hangtag-spring-boot-starter-mybatis/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1,3 +0,0 @@
-cn.hangtag.framework.datasource.config.HangtagDataSourceAutoConfiguration
-cn.hangtag.framework.mybatis.config.HangtagMybatisAutoConfiguration
-cn.hangtag.framework.translate.config.HangtagTranslateAutoConfiguration
\ No newline at end of file
diff --git a/hangtag-framework/hangtag-spring-boot-starter-protection/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/hangtag-framework/hangtag-spring-boot-starter-protection/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index dc1fb71..0000000
--- a/hangtag-framework/hangtag-spring-boot-starter-protection/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1,4 +0,0 @@
-cn.hangtag.framework.idempotent.config.HangtagIdempotentConfiguration
-cn.hangtag.framework.lock4j.config.HangtagLock4jConfiguration
-cn.hangtag.framework.ratelimiter.config.HangtagRateLimiterConfiguration
-cn.hangtag.framework.signature.config.HangtagApiSignatureAutoConfiguration
\ No newline at end of file
diff --git a/hangtag-framework/hangtag-spring-boot-starter-redis/target/classes/META-INF/spring-configuration-metadata.json b/hangtag-framework/hangtag-spring-boot-starter-redis/target/classes/META-INF/spring-configuration-metadata.json
deleted file mode 100644
index e148863..0000000
--- a/hangtag-framework/hangtag-spring-boot-starter-redis/target/classes/META-INF/spring-configuration-metadata.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "groups": [
-    {
-      "name": "hangtag.cache",
-      "type": "cn.hangtag.framework.redis.config.HangtagCacheProperties",
-      "sourceType": "cn.hangtag.framework.redis.config.HangtagCacheProperties"
-    }
-  ],
-  "properties": [
-    {
-      "name": "hangtag.cache.redis-scan-batch-size",
-      "type": "java.lang.Integer",
-      "description": "redis scan 一次返回数量",
-      "sourceType": "cn.hangtag.framework.redis.config.HangtagCacheProperties"
-    }
-  ],
-  "hints": []
-}
\ No newline at end of file
diff --git a/hangtag-framework/hangtag-spring-boot-starter-redis/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/hangtag-framework/hangtag-spring-boot-starter-redis/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 14f5585..0000000
--- a/hangtag-framework/hangtag-spring-boot-starter-redis/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1,2 +0,0 @@
-cn.hangtag.framework.redis.config.HangtagRedisAutoConfiguration
-cn.hangtag.framework.redis.config.HangtagCacheAutoConfiguration
\ No newline at end of file
diff --git a/hangtag-framework/hangtag-spring-boot-starter-security/target/classes/META-INF/spring-configuration-metadata.json b/hangtag-framework/hangtag-spring-boot-starter-security/target/classes/META-INF/spring-configuration-metadata.json
deleted file mode 100644
index 5c537ab..0000000
--- a/hangtag-framework/hangtag-spring-boot-starter-security/target/classes/META-INF/spring-configuration-metadata.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "groups": [
-    {
-      "name": "hangtag.security",
-      "type": "cn.hangtag.framework.security.config.SecurityProperties",
-      "sourceType": "cn.hangtag.framework.security.config.SecurityProperties"
-    }
-  ],
-  "properties": [
-    {
-      "name": "hangtag.security.mock-enable",
-      "type": "java.lang.Boolean",
-      "description": "mock 模式的开关",
-      "sourceType": "cn.hangtag.framework.security.config.SecurityProperties"
-    },
-    {
-      "name": "hangtag.security.mock-secret",
-      "type": "java.lang.String",
-      "description": "mock 模式的密钥 一定要配置密钥，保证安全性",
-      "sourceType": "cn.hangtag.framework.security.config.SecurityProperties"
-    },
-    {
-      "name": "hangtag.security.password-encoder-length",
-      "type": "java.lang.Integer",
-      "description": "PasswordEncoder 加密复杂度，越高开销越大",
-      "sourceType": "cn.hangtag.framework.security.config.SecurityProperties"
-    },
-    {
-      "name": "hangtag.security.permit-all-urls",
-      "type": "java.util.List<java.lang.String>",
-      "description": "免登录的 URL 列表",
-      "sourceType": "cn.hangtag.framework.security.config.SecurityProperties"
-    },
-    {
-      "name": "hangtag.security.token-header",
-      "type": "java.lang.String",
-      "description": "HTTP 请求时，访问令牌的请求 Header",
-      "sourceType": "cn.hangtag.framework.security.config.SecurityProperties"
-    },
-    {
-      "name": "hangtag.security.token-parameter",
-      "type": "java.lang.String",
-      "description": "HTTP 请求时，访问令牌的请求参数 初始目的：解决 WebSocket 无法通过 header 传参，只能通过 token 参数拼接",
-      "sourceType": "cn.hangtag.framework.security.config.SecurityProperties"
-    }
-  ],
-  "hints": []
-}
\ No newline at end of file
diff --git a/hangtag-framework/hangtag-spring-boot-starter-security/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/hangtag-framework/hangtag-spring-boot-starter-security/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 14d334e..0000000
--- a/hangtag-framework/hangtag-spring-boot-starter-security/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1,3 +0,0 @@
-cn.hangtag.framework.security.config.HangtagSecurityAutoConfiguration
-cn.hangtag.framework.security.config.HangtagWebSecurityConfigurerAdapter
-cn.hangtag.framework.operatelog.config.HangtagOperateLogConfiguration
\ No newline at end of file
diff --git a/hangtag-framework/hangtag-spring-boot-starter-web/target/classes/META-INF/spring-configuration-metadata.json b/hangtag-framework/hangtag-spring-boot-starter-web/target/classes/META-INF/spring-configuration-metadata.json
deleted file mode 100644
index e817c6c..0000000
--- a/hangtag-framework/hangtag-spring-boot-starter-web/target/classes/META-INF/spring-configuration-metadata.json
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  "groups": [
-    {
-      "name": "hangtag.swagger",
-      "type": "cn.hangtag.framework.swagger.config.SwaggerProperties",
-      "sourceType": "cn.hangtag.framework.swagger.config.SwaggerProperties"
-    },
-    {
-      "name": "hangtag.web",
-      "type": "cn.hangtag.framework.web.config.WebProperties",
-      "sourceType": "cn.hangtag.framework.web.config.WebProperties"
-    },
-    {
-      "name": "hangtag.web.admin-api",
-      "type": "cn.hangtag.framework.web.config.WebProperties$Api",
-      "sourceType": "cn.hangtag.framework.web.config.WebProperties"
-    },
-    {
-      "name": "hangtag.web.admin-ui",
-      "type": "cn.hangtag.framework.web.config.WebProperties$Ui",
-      "sourceType": "cn.hangtag.framework.web.config.WebProperties"
-    },
-    {
-      "name": "hangtag.web.app-api",
-      "type": "cn.hangtag.framework.web.config.WebProperties$Api",
-      "sourceType": "cn.hangtag.framework.web.config.WebProperties"
-    },
-    {
-      "name": "hangtag.xss",
-      "type": "cn.hangtag.framework.xss.config.XssProperties",
-      "sourceType": "cn.hangtag.framework.xss.config.XssProperties"
-    }
-  ],
-  "properties": [
-    {
-      "name": "hangtag.swagger.author",
-      "type": "java.lang.String",
-      "description": "作者",
-      "sourceType": "cn.hangtag.framework.swagger.config.SwaggerProperties"
-    },
-    {
-      "name": "hangtag.swagger.description",
-      "type": "java.lang.String",
-      "description": "描述",
-      "sourceType": "cn.hangtag.framework.swagger.config.SwaggerProperties"
-    },
-    {
-      "name": "hangtag.swagger.email",
-      "type": "java.lang.String",
-      "description": "email",
-      "sourceType": "cn.hangtag.framework.swagger.config.SwaggerProperties"
-    },
-    {
-      "name": "hangtag.swagger.license",
-      "type": "java.lang.String",
-      "description": "license",
-      "sourceType": "cn.hangtag.framework.swagger.config.SwaggerProperties"
-    },
-    {
-      "name": "hangtag.swagger.license-url",
-      "type": "java.lang.String",
-      "description": "license-url",
-      "sourceType": "cn.hangtag.framework.swagger.config.SwaggerProperties"
-    },
-    {
-      "name": "hangtag.swagger.title",
-      "type": "java.lang.String",
-      "description": "标题",
-      "sourceType": "cn.hangtag.framework.swagger.config.SwaggerProperties"
-    },
-    {
-      "name": "hangtag.swagger.url",
-      "type": "java.lang.String",
-      "description": "url",
-      "sourceType": "cn.hangtag.framework.swagger.config.SwaggerProperties"
-    },
-    {
-      "name": "hangtag.swagger.version",
-      "type": "java.lang.String",
-      "description": "版本",
-      "sourceType": "cn.hangtag.framework.swagger.config.SwaggerProperties"
-    },
-    {
-      "name": "hangtag.web.admin-api.controller",
-      "type": "java.lang.String",
-      "description": "Controller 所在包的 Ant 路径规则 主要目的是，给该 Controller 设置指定的 {@link #prefix}",
-      "sourceType": "cn.hangtag.framework.web.config.WebProperties$Api"
-    },
-    {
-      "name": "hangtag.web.admin-api.prefix",
-      "type": "java.lang.String",
-      "description": "API 前缀，实现所有 Controller 提供的 RESTFul API 的统一前缀 意义：通过该前缀，避免 Swagger、Actuator 意外通过 Nginx 暴露出来给外部，带来安全性问题      这样，Nginx 只需要配置转发到 \/api\/* 的所有接口即可。 @see HangtagWebAutoConfiguration#configurePathMatch(PathMatchConfigurer)",
-      "sourceType": "cn.hangtag.framework.web.config.WebProperties$Api"
-    },
-    {
-      "name": "hangtag.web.admin-ui.url",
-      "type": "java.lang.String",
-      "description": "访问地址",
-      "sourceType": "cn.hangtag.framework.web.config.WebProperties$Ui"
-    },
-    {
-      "name": "hangtag.web.app-api.controller",
-      "type": "java.lang.String",
-      "description": "Controller 所在包的 Ant 路径规则 主要目的是，给该 Controller 设置指定的 {@link #prefix}",
-      "sourceType": "cn.hangtag.framework.web.config.WebProperties$Api"
-    },
-    {
-      "name": "hangtag.web.app-api.prefix",
-      "type": "java.lang.String",
-      "description": "API 前缀，实现所有 Controller 提供的 RESTFul API 的统一前缀 意义：通过该前缀，避免 Swagger、Actuator 意外通过 Nginx 暴露出来给外部，带来安全性问题      这样，Nginx 只需要配置转发到 \/api\/* 的所有接口即可。 @see HangtagWebAutoConfiguration#configurePathMatch(PathMatchConfigurer)",
-      "sourceType": "cn.hangtag.framework.web.config.WebProperties$Api"
-    },
-    {
-      "name": "hangtag.xss.enable",
-      "type": "java.lang.Boolean",
-      "description": "是否开启，默认为 true",
-      "sourceType": "cn.hangtag.framework.xss.config.XssProperties"
-    },
-    {
-      "name": "hangtag.xss.exclude-urls",
-      "type": "java.util.List<java.lang.String>",
-      "description": "需要排除的 URL，默认为空",
-      "sourceType": "cn.hangtag.framework.xss.config.XssProperties"
-    }
-  ],
-  "hints": []
-}
\ No newline at end of file
diff --git a/hangtag-framework/hangtag-spring-boot-starter-web/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/hangtag-framework/hangtag-spring-boot-starter-web/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index c1b390b..0000000
--- a/hangtag-framework/hangtag-spring-boot-starter-web/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1,6 +0,0 @@
-cn.hangtag.framework.apilog.config.HangtagApiLogAutoConfiguration
-cn.hangtag.framework.jackson.config.HangtagJacksonAutoConfiguration
-cn.hangtag.framework.swagger.config.HangtagSwaggerAutoConfiguration
-cn.hangtag.framework.web.config.HangtagWebAutoConfiguration
-cn.hangtag.framework.xss.config.HangtagXssAutoConfiguration
-cn.hangtag.framework.banner.config.HangtagBannerAutoConfiguration
\ No newline at end of file
diff --git a/hangtag-framework/hangtag-spring-boot-starter-web/target/classes/banner.txt b/hangtag-framework/hangtag-spring-boot-starter-web/target/classes/banner.txt
deleted file mode 100644
index b45392d..0000000
--- a/hangtag-framework/hangtag-spring-boot-starter-web/target/classes/banner.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Application Version: ${hangtag.info.version}
-Spring Boot Version: ${spring-boot.version}
-
-.__   __.   ______      .______    __    __    _______
-|  \ |  |  /  __  \     |   _  \  |  |  |  |  /  _____|
-|   \|  | |  |  |  |    |  |_)  | |  |  |  | |  |  __
-|  . `  | |  |  |  |    |   _  <  |  |  |  | |  | |_ |
-|  |\   | |  `--'  |    |  |_)  | |  `--'  | |  |__| |
-|__| \__|  \______/     |______/   \______/   \______|
-
-███╗   ██╗ ██████╗     ██████╗ ██╗   ██╗ ██████╗
-████╗  ██║██╔═══██╗    ██╔══██╗██║   ██║██╔════╝
-██╔██╗ ██║██║   ██║    ██████╔╝██║   ██║██║  ███╗
-██║╚██╗██║██║   ██║    ██╔══██╗██║   ██║██║   ██║
-██║ ╚████║╚██████╔╝    ██████╔╝╚██████╔╝╚██████╔╝
-╚═╝  ╚═══╝ ╚═════╝     ╚═════╝  ╚═════╝  ╚═════╝
diff --git a/hangtag-framework/hangtag-spring-boot-starter-websocket/target/classes/META-INF/spring-configuration-metadata.json b/hangtag-framework/hangtag-spring-boot-starter-websocket/target/classes/META-INF/spring-configuration-metadata.json
deleted file mode 100644
index ed96135..0000000
--- a/hangtag-framework/hangtag-spring-boot-starter-websocket/target/classes/META-INF/spring-configuration-metadata.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "groups": [
-    {
-      "name": "hangtag.websocket",
-      "type": "cn.hangtag.framework.websocket.config.WebSocketProperties",
-      "sourceType": "cn.hangtag.framework.websocket.config.WebSocketProperties"
-    }
-  ],
-  "properties": [
-    {
-      "name": "hangtag.websocket.path",
-      "type": "java.lang.String",
-      "description": "WebSocket 的连接路径",
-      "sourceType": "cn.hangtag.framework.websocket.config.WebSocketProperties"
-    },
-    {
-      "name": "hangtag.websocket.sender-type",
-      "type": "java.lang.String",
-      "description": "消息发送器的类型 可选值：local、redis、rocketmq、kafka、rabbitmq",
-      "sourceType": "cn.hangtag.framework.websocket.config.WebSocketProperties"
-    }
-  ],
-  "hints": []
-}
\ No newline at end of file
diff --git a/hangtag-framework/hangtag-spring-boot-starter-websocket/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/hangtag-framework/hangtag-spring-boot-starter-websocket/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index bc969c1..0000000
--- a/hangtag-framework/hangtag-spring-boot-starter-websocket/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-cn.hangtag.framework.websocket.config.HangtagWebSocketAutoConfiguration
\ No newline at end of file
diff --git a/hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/ErrorCodeConstants.java b/hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/ErrorCodeConstants.java
index beab5bb..10bd9af 100644
--- a/hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/ErrorCodeConstants.java
+++ b/hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/ErrorCodeConstants.java
@@ -10,7 +10,7 @@ public interface ErrorCodeConstants  extends cn.hangtag.module.system.enums.Erro
  	ErrorCode CUSTOMER_NOT_EXISTS = new ErrorCode(3300, "客户不存在");
 	ErrorCode SHAPE_TEMPLATE_NOT_EXISTS = new ErrorCode(3400, "图形模板管理 不存在");
     ErrorCode DRAFT_DESIGN_DATA_NOT_EXISTS = new ErrorCode(3500, "稿件模板数据 不存在");
-    ErrorCode SALE_ORDER_NOT_EXISTS = new ErrorCode(3600, "OMS销售订单主表不存在");
+    ErrorCode SALE_ORDER_NOT_EXISTS = new ErrorCode(3600, "OMS销售订单不存在");
     ErrorCode SALE_ORDER_ENTRY_NOT_EXISTS = new ErrorCode(3700, "OMS销售订单明细不存在");
     ErrorCode SALE_ORDER_ENTRY_PRICE_NOT_NULL= new ErrorCode(3701, "单价不允许为空");
  	ErrorCode CUSTOMER_BRAND_NOT_EXISTS = new ErrorCode(3800, "客户和品牌关联不存在");
diff --git a/hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/TimeRangeTypeEnum.java b/hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/TimeRangeTypeEnum.java
new file mode 100644
index 0000000..e30c84d
--- /dev/null
+++ b/hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/TimeRangeTypeEnum.java
@@ -0,0 +1,48 @@
+package cn.hangtag.module.oms.enums;
+
+import cn.hangtag.framework.common.core.IntArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 时间范围类型的枚举
+ *
+ * @author owen
+ */
+@AllArgsConstructor
+@Getter
+public enum TimeRangeTypeEnum implements IntArrayValuable {
+
+    /**
+     * 天
+     */
+    DAY(1),
+    /**
+     * 周
+     */
+    WEEK(7),
+    /**
+     * 月
+     */
+    MONTH(30),
+    /**
+     * 年
+     */
+    YEAR(365),
+    ;
+
+    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(TimeRangeTypeEnum::getType).toArray();
+
+    /**
+     * 类型
+     */
+    private final Integer type;
+
+    @Override
+    public int[] array() {
+        return ARRAYS;
+    }
+
+}
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/app/AppSaleOrderController.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/app/AppSaleOrderController.java
index 8a3c178..22023e0 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/app/AppSaleOrderController.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/app/AppSaleOrderController.java
@@ -1,35 +1,203 @@
 package cn.hangtag.module.oms.controller.admin.app;
 
 
+import cn.hangtag.framework.apilog.core.annotation.ApiAccessLog;
 import cn.hangtag.framework.common.pojo.CommonResult;
+import cn.hangtag.framework.common.pojo.PageParam;
 import cn.hangtag.framework.common.pojo.PageResult;
+import cn.hangtag.framework.common.util.number.NumberUtils;
 import cn.hangtag.framework.common.util.object.BeanUtils;
+import cn.hangtag.framework.excel.core.util.ExcelUtils;
+import cn.hangtag.framework.security.core.LoginUser;
+import cn.hangtag.framework.security.core.util.SecurityFrameworkUtils;
 import cn.hangtag.module.oms.controller.admin.productinfo.vo.ProductInfoPageReqVO;
 import cn.hangtag.module.oms.controller.admin.productinfo.vo.ProductInfoRespVO;
+import cn.hangtag.module.oms.controller.admin.saleorder.vo.SaleOrderPageReqVO;
+import cn.hangtag.module.oms.controller.admin.saleorder.vo.SaleOrderRemarkReqVO;
+import cn.hangtag.module.oms.controller.admin.saleorder.vo.SaleOrderRespVO;
+import cn.hangtag.module.oms.controller.admin.saleorder.vo.SaleOrderSaveReqVO;
+import cn.hangtag.module.oms.convert.saleorder.SaleOrderConvert;
+import cn.hangtag.module.oms.dal.dataobject.customer.CustomerDO;
 import cn.hangtag.module.oms.dal.dataobject.productinfo.ProductInfoDO;
+import cn.hangtag.module.oms.dal.dataobject.saleorder.SaleOrderDO;
+import cn.hangtag.module.oms.service.customer.CustomerService;
 import cn.hangtag.module.oms.service.productinfo.ProductInfoService;
 import cn.hangtag.module.oms.service.saleorder.SaleOrderService;
+import cn.hangtag.module.system.api.user.AdminUserApi;
+import cn.hangtag.module.system.api.user.dto.AdminUserRespDTO;
+import cn.hutool.core.map.MapUtil;
+import com.alibaba.fastjson.JSONObject;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.annotation.security.PermitAll;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
+import static cn.hangtag.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.hangtag.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "APP - 销售订单")
 @RestController
-@RequestMapping("/oms/app/saleorder")
+@RequestMapping("/oms/app/sale-order")
 @Validated
 public class AppSaleOrderController{
     @Resource
     private SaleOrderService saleOrderService;
+    @Resource
+    private CustomerService customerService;
+    @Resource
+    private AdminUserApi adminUserApi;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建销售订单")
+    public CommonResult<Long> createSaleOrder(@Valid @RequestBody SaleOrderSaveReqVO createReqVO) {
+        return success(saleOrderService.createSaleOrder(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新销售订单")
+    public CommonResult<Boolean> updateSaleOrder(@Valid @RequestBody SaleOrderSaveReqVO updateReqVO) {
+        saleOrderService.updateSaleOrder(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除销售订单")
+    @Parameter(name = "id", description = "编号", required = true)
+    public CommonResult<Boolean> deleteSaleOrder(@RequestParam("id") Long id) {
+        saleOrderService.deleteSaleOrder(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得销售订单")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    public CommonResult<SaleOrderRespVO> getSaleOrder(@RequestParam("id") Long id) {
+        SaleOrderDO saleOrder = saleOrderService.getSaleOrder(id);
+        if(saleOrder == null){
+            return success(null);
+        }
+        // 拼接数据
+        List<cn.hangtag.module.oms.dal.dataobject.saleorderentry.SaleOrderEntryDO> entrys = saleOrderService.getSaleOrderEntryListByParentId(id);
+
+        CustomerDO customer = customerService.getCustomer(saleOrder.getCustomerId());
+        // 1.2 获取修改人
+        AdminUserRespDTO updater = adminUserApi.getUser(NumberUtils.parseLong(saleOrder.getUpdater()));
+        AdminUserRespDTO auditor = adminUserApi.getUser(NumberUtils.parseLong(saleOrder.getAuditor()));
+
+        return success(SaleOrderConvert.INSTANCE.convert(saleOrder,entrys,customer,updater,auditor));
+
+        //return success(BeanUtils.toBean(saleOrder, SaleOrderRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得销售订单分页")
+    public CommonResult<PageResult<SaleOrderRespVO>> getSaleOrderPage(@Valid SaleOrderPageReqVO pageReqVO) {
+        LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+        CustomerDO customer = customerService.getCustomerByUserId(loginUser.getId());
+        pageReqVO.setCustomerId(customer.getId());
+        PageResult<SaleOrderDO> pageResult = saleOrderService.getSaleOrderPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, SaleOrderRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出销售订单 Excel")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportSaleOrderExcel(@Valid SaleOrderPageReqVO pageReqVO,
+                                     HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+
+        LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+        CustomerDO customer = customerService.getCustomerByUserId(loginUser.getId());
+        pageReqVO.setCustomerId(customer.getId());
+        List<SaleOrderDO> list = saleOrderService.getSaleOrderPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "销售订单.xls", "数据", SaleOrderRespVO.class,
+                BeanUtils.toBean(list, SaleOrderRespVO.class));
+    }
+
+    // ==================== 子表（销售订单明细） ====================
+
+    @GetMapping("/sale-order-entry/list-by-parent-id")
+    @Operation(summary = "获得销售订单明细列表")
+    @Parameter(name = "parentId", description = "主表id")
+    public CommonResult<List<cn.hangtag.module.oms.dal.dataobject.saleorderentry.SaleOrderEntryDO>> getSaleOrderEntryListByParentId(@RequestParam("parentId") Long parentId) {
+        return success(saleOrderService.getSaleOrderEntryListByParentId(parentId));
+    }
+
+
+    @GetMapping("/get-count")
+    @Operation(summary = "获得销售订单 分页 tab count")
+    public CommonResult<Map<Integer, Long>> getSpuCount() {
+        LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+        CustomerDO customer = customerService.getCustomerByUserId(loginUser.getId());
+        Long customerId = null;
+        if(customer!=null){
+            customerId = customer.getId();
+        }
+        return success(saleOrderService.getTabsCount(customerId));
+    }
+
+    @PostMapping("/updateSaleOrderBillStatus")
+    @Operation(summary = "更新销售订单的状态")
+    public CommonResult<Boolean> updateSaleOrderBillStatus(@RequestParam("ids") List<Long> ids,
+                                                           @RequestParam("status") String status) {
+        saleOrderService.updateSaleOrderBillStatus(ids, status);
+        return success(true);
+    }
+
+
+    @PutMapping("/generateProduceOrder")
+    @Operation(summary = "生成生成制单")
+    public CommonResult<Boolean> generateProduceOrder(@RequestParam("ids") List<Long> ids) {
+        saleOrderService.generateProduceOrder(ids);
+        return success(true);
+    }
+
+    @PostMapping("/rejectOrder")
+    @Operation(summary = "驳回")
+    public CommonResult<Boolean> rejectOrder(@RequestBody JSONObject jobs) {
+        Long[] ids = jobs.getObject("ids", new Long[0].getClass());
+        String reason = jobs.getString("reason");
+        saleOrderService.updateSaleOrderBillStatus(Arrays.asList(ids), "reject", MapUtil.of("rejectReason",reason));
+        return success(true);
+    }
+
+    /**
+     * 生成PDF文档并下载
+     * @param response HTTP响应
+     * @throws Exception 异常
+     */
+    @GetMapping("/download")
+    @PermitAll
+    public void downloadPdf(HttpServletResponse response) throws Exception{
+        saleOrderService.generatePdf(response);
+    }
+    @PutMapping("/update-remark")
+    @Operation(summary = "订单备注")
+    public CommonResult<Boolean> updateOrderRemark(@RequestBody SaleOrderRemarkReqVO reqVO) {
+        saleOrderService.updateOrderRemark(reqVO);
+        return success(true);
+    }
+
+
+    @PutMapping("/update-entrys")
+    @Operation(summary = "更新销售订单")
+    public CommonResult<Boolean> updateSaleOrderEntry(@Valid @RequestBody SaleOrderSaveReqVO updateReqVO) {
+        saleOrderService.updateSaleOrder(updateReqVO);
+        return success(true);
+    }
+
 
 
 }
\ No newline at end of file
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/app/AppTradeStatisticsController.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/app/AppTradeStatisticsController.java
new file mode 100644
index 0000000..b2c1960
--- /dev/null
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/app/AppTradeStatisticsController.java
@@ -0,0 +1,86 @@
+package cn.hangtag.module.oms.controller.admin.app;
+
+import cn.hangtag.framework.common.pojo.CommonResult;
+import cn.hangtag.framework.security.core.LoginUser;
+import cn.hangtag.framework.security.core.util.SecurityFrameworkUtils;
+import cn.hangtag.module.oms.controller.admin.common.vo.DataComparisonRespVO;
+import cn.hangtag.module.oms.controller.admin.trade.vo.TradeOrderCountRespVO;
+import cn.hangtag.module.oms.controller.admin.trade.vo.TradeOrderSummaryRespVO;
+import cn.hangtag.module.oms.controller.admin.trade.vo.TradeOrderTrendReqVO;
+import cn.hangtag.module.oms.controller.admin.trade.vo.TradeOrderTrendRespVO;
+import cn.hangtag.module.oms.dal.dataobject.customer.CustomerDO;
+import cn.hangtag.module.oms.enums.common.BillStatusEnum;
+import cn.hangtag.module.oms.service.customer.CustomerService;
+import cn.hangtag.module.oms.service.saleorder.SaleOrderService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+
+import static cn.hangtag.framework.common.pojo.CommonResult.success;
+
+
+@Tag(name = "管理后台 - 订单统计")
+@RestController
+@RequestMapping("/oms/app/statistics/trade")
+@Validated
+@Slf4j
+public class AppTradeStatisticsController {
+
+    @Resource
+    private SaleOrderService saleOrderService;
+    @Resource
+    private CustomerService customerService;
+
+    @GetMapping("/order-comparison")
+    @Operation(summary = "获得交易订单数量")
+    //@PreAuthorize("@ss.hasPermission('statistics:order:query')")
+    public CommonResult<DataComparisonRespVO<TradeOrderSummaryRespVO>> getOrderComparison() {
+        LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+        CustomerDO customer = customerService.getCustomerByUserId(loginUser.getId());
+        Long customerId = null;
+        if(customer!=null){
+            customerId = customer.getId();
+        }
+        return success(saleOrderService.getOrderComparison(customerId));
+    }
+
+
+    @GetMapping("/order-count")
+    @Operation(summary = "获得交易订单数量")
+    public CommonResult<TradeOrderCountRespVO> getOrderCount() {
+        LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+        CustomerDO customer = customerService.getCustomerByUserId(loginUser.getId());
+        Long customerId = null;
+        if(customer!=null){
+            customerId = customer.getId();
+        }
+        TradeOrderCountRespVO tradeOrderCountRespVO = new TradeOrderCountRespVO();
+        // 订单统计
+        Long rejectCount = saleOrderService.getCountByBillStatus(BillStatusEnum.REJECT.getValue(),customerId);
+        Long saveCount = saleOrderService.getCountByBillStatus(BillStatusEnum.SAVE.getValue(),customerId);
+        Long submitCount = saleOrderService.getCountByBillStatus(BillStatusEnum.SUBMIT.getValue(),customerId);
+        Long auditCount = saleOrderService.getCountByBillStatus(BillStatusEnum.AUDIT.getValue(),customerId);
+        tradeOrderCountRespVO.setOrderCountAA(rejectCount);
+        tradeOrderCountRespVO.setOrderCountA(saveCount);
+        tradeOrderCountRespVO.setOrderCountB(submitCount);
+        tradeOrderCountRespVO.setOrderCountC(auditCount);
+        // 拼接返回
+        return success(tradeOrderCountRespVO);
+    }
+
+
+    @GetMapping("/order-count-trend")
+    @Operation(summary = "获得订单量趋势统计")
+    public CommonResult<List<DataComparisonRespVO<TradeOrderTrendRespVO>>> getOrderCountTrendComparison(@Valid TradeOrderTrendReqVO reqVO) {
+        return success(saleOrderService.getOrderCountTrendComparison(reqVO));
+    }
+
+}
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/common/vo/DataComparisonRespVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/common/vo/DataComparisonRespVO.java
index a1b0105..83424a2 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/common/vo/DataComparisonRespVO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/common/vo/DataComparisonRespVO.java
@@ -17,4 +17,10 @@ public class DataComparisonRespVO<T> {
     @Schema(description = "参照数据", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private T reference;
 
+    @Schema(description = "当前数据", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private T value2;
+
+    @Schema(description = "参照数据", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private T reference2;
+
 }
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/SaleOrderController.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/SaleOrderController.java
index 7aaffb5..77cdc4d 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/SaleOrderController.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/SaleOrderController.java
@@ -1,8 +1,13 @@
 package cn.hangtag.module.oms.controller.admin.saleorder;
 
+import cn.hangtag.framework.common.util.number.NumberUtils;
+import cn.hangtag.module.oms.convert.saleorder.SaleOrderConvert;
+import cn.hangtag.module.oms.dal.dataobject.customer.CustomerDO;
+import cn.hangtag.module.oms.service.customer.CustomerService;
+import cn.hangtag.module.system.api.user.AdminUserApi;
+import cn.hangtag.module.system.api.user.dto.AdminUserRespDTO;
 import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson.JSONObject;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -12,7 +17,6 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
 import javax.annotation.security.PermitAll;
-import javax.validation.constraints.*;
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;
@@ -42,6 +46,10 @@ public class SaleOrderController {
 
     @Resource
     private SaleOrderService saleOrderService;
+    @Resource
+    private CustomerService customerService;
+    @Resource
+    private AdminUserApi adminUserApi;
 
     @PostMapping("/create")
     @Operation(summary = "创建销售订单")
@@ -73,7 +81,20 @@ public class SaleOrderController {
     @PreAuthorize("@ss.hasPermission('oms:sale-order:query')")
     public CommonResult<SaleOrderRespVO> getSaleOrder(@RequestParam("id") Long id) {
         SaleOrderDO saleOrder = saleOrderService.getSaleOrder(id);
-        return success(BeanUtils.toBean(saleOrder, SaleOrderRespVO.class));
+        if(saleOrder == null){
+            return success(null);
+        }
+        // 拼接数据
+        List<SaleOrderEntryDO> entrys = saleOrderService.getSaleOrderEntryListByParentId(id);
+
+        CustomerDO customer = customerService.getCustomer(saleOrder.getCustomerId());
+        // 1.2 获取修改人
+        AdminUserRespDTO updater = adminUserApi.getUser(NumberUtils.parseLong(saleOrder.getUpdater()));
+        AdminUserRespDTO auditor = adminUserApi.getUser(NumberUtils.parseLong(saleOrder.getAuditor()));
+
+        return success(SaleOrderConvert.INSTANCE.convert(saleOrder,entrys,customer,updater,auditor));
+
+        //return success(BeanUtils.toBean(saleOrder, SaleOrderRespVO.class));
     }
 
     @GetMapping("/page")
@@ -112,7 +133,7 @@ public class SaleOrderController {
     @Operation(summary = "获得销售订单 分页 tab count")
     @PreAuthorize("@ss.hasPermission('oms:sale-order:query')")
     public CommonResult<Map<Integer, Long>> getSpuCount() {
-        return success(saleOrderService.getTabsCount());
+        return success(saleOrderService.getTabsCount(null));
     }
 
     @PostMapping("/updateSaleOrderBillStatus")
@@ -153,5 +174,21 @@ public class SaleOrderController {
     public void downloadPdf(HttpServletResponse response) throws Exception{
         saleOrderService.generatePdf(response);
     }
+    @PutMapping("/update-remark")
+    @Operation(summary = "订单备注")
+    @PreAuthorize("@ss.hasPermission('oms:sale-order:update')")
+    public CommonResult<Boolean> updateOrderRemark(@RequestBody SaleOrderRemarkReqVO reqVO) {
+        saleOrderService.updateOrderRemark(reqVO);
+        return success(true);
+    }
+
+
+    @PutMapping("/update-entrys")
+    @Operation(summary = "更新销售订单")
+    @PreAuthorize("@ss.hasPermission('oms:sale-order:update')")
+    public CommonResult<Boolean> updateSaleOrderEntry(@Valid @RequestBody SaleOrderSaveReqVO updateReqVO) {
+        saleOrderService.updateSaleOrder(updateReqVO);
+        return success(true);
+    }
 
 }
\ No newline at end of file
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderRemarkReqVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderRemarkReqVO.java
new file mode 100644
index 0000000..1b36ae2
--- /dev/null
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderRemarkReqVO.java
@@ -0,0 +1,21 @@
+package cn.hangtag.module.oms.controller.admin.saleorder.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - 订单备注 Request VO")
+@Data
+public class SaleOrderRemarkReqVO {
+
+    @Schema(description = "订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    @NotNull(message = "订单编号不能为空")
+    private Long id;
+
+    @Schema(description = "商家备注", example = "你猜一下")
+    @NotEmpty(message = "订单备注不能为空")
+    private String remark;
+
+}
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderRespVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderRespVO.java
index dec48f6..b0aef64 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderRespVO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderRespVO.java
@@ -2,6 +2,8 @@ package cn.hangtag.module.oms.controller.admin.saleorder.vo;
 
 import cn.hangtag.framework.excel.core.annotations.DictFormat;
 import cn.hangtag.framework.excel.core.convert.DictConvert;
+import cn.hangtag.module.oms.controller.admin.customer.vo.CustomerRespVO;
+import cn.hangtag.module.oms.dal.dataobject.customer.CustomerDO;
 import cn.hangtag.module.oms.enums.DictTypeConstants;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
@@ -70,8 +72,43 @@ public class SaleOrderRespVO {
     @ExcelProperty("备注")
     private String remarks;
 
+    @Schema(description = "发票抬头")
+    @ExcelProperty("发票抬头")
+    private String invoiceCode;
+
+    @Schema(description = "发票名称")
+    @ExcelProperty("发票名称")
+    private String invoiceName;
+
+    @Schema(description = "发票地址")
+    @ExcelProperty("发票地址")
+    private String address;
+
+    @Schema(description = "货币")
+    @ExcelProperty("货币")
+    private String currency;
+
+    @Schema(description = "发票备注")
+    @ExcelProperty("发票备注")
+    private String invoiceRemarks;
+
     @Schema(description = "驳回原因")
     @ExcelProperty("驳回原因")
     private String rejectReason;
 
+    @Schema(description = "修改人")
+    private String updaterName;
+
+    @Schema(description = "审核人")
+
+    private String auditorName;
+    @Schema(description = "审核时间")
+    private LocalDateTime auditorTime;
+
+    @Schema(description = "客户")
+    private CustomerRespVO customer;
+
+    @Schema(description = "产品明细")
+    private List<cn.hangtag.module.oms.dal.dataobject.saleorderentry.SaleOrderEntryDO> entrys;
+
 }
\ No newline at end of file
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderSaveReqVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderSaveReqVO.java
index d7e9593..9e10196 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderSaveReqVO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderSaveReqVO.java
@@ -66,6 +66,6 @@ public class SaleOrderSaveReqVO {
     private String rejectReason;
 
     @Schema(description = "销售订单明细列表")
-    private List<SaleOrderEntryDO> saleOrderEntrys;
+    private List<SaleOrderEntryDO> entrys;
 
 }
\ No newline at end of file
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/trade/TradeStatisticsController.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/trade/TradeStatisticsController.java
index 782843e..b3246da 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/trade/TradeStatisticsController.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/trade/TradeStatisticsController.java
@@ -2,7 +2,11 @@ package cn.hangtag.module.oms.controller.admin.trade;
 
 import cn.hangtag.framework.common.pojo.CommonResult;
 import cn.hangtag.module.oms.controller.admin.common.vo.DataComparisonRespVO;
+import cn.hangtag.module.oms.controller.admin.trade.vo.TradeOrderCountRespVO;
 import cn.hangtag.module.oms.controller.admin.trade.vo.TradeOrderSummaryRespVO;
+import cn.hangtag.module.oms.controller.admin.trade.vo.TradeOrderTrendReqVO;
+import cn.hangtag.module.oms.controller.admin.trade.vo.TradeOrderTrendRespVO;
+import cn.hangtag.module.oms.enums.common.BillStatusEnum;
 import cn.hangtag.module.oms.service.saleorder.SaleOrderService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -14,6 +18,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import java.util.List;
 
 import static cn.hangtag.framework.common.pojo.CommonResult.success;
 
@@ -34,4 +41,32 @@ public class TradeStatisticsController {
     public CommonResult<DataComparisonRespVO<TradeOrderSummaryRespVO>> getOrderComparison() {
         return success(saleOrderService.getOrderComparison());
     }
+
+
+    @GetMapping("/order-count")
+    @Operation(summary = "获得交易订单数量")
+    @PreAuthorize("@ss.hasPermission('statistics:trade:query')")
+    public CommonResult<TradeOrderCountRespVO> getOrderCount() {
+        TradeOrderCountRespVO tradeOrderCountRespVO = new TradeOrderCountRespVO();
+        // 订单统计
+        Long rejectCount = saleOrderService.getCountByBillStatus(BillStatusEnum.REJECT.getValue());
+        Long saveCount = saleOrderService.getCountByBillStatus(BillStatusEnum.SAVE.getValue());
+        Long submitCount = saleOrderService.getCountByBillStatus(BillStatusEnum.SUBMIT.getValue());
+        Long auditCount = saleOrderService.getCountByBillStatus(BillStatusEnum.AUDIT.getValue());
+        tradeOrderCountRespVO.setOrderCountAA(rejectCount);
+        tradeOrderCountRespVO.setOrderCountA(saveCount);
+        tradeOrderCountRespVO.setOrderCountB(submitCount);
+        tradeOrderCountRespVO.setOrderCountC(auditCount);
+        // 拼接返回
+        return success(tradeOrderCountRespVO);
+    }
+
+
+    @GetMapping("/order-count-trend")
+    @Operation(summary = "获得订单量趋势统计")
+    @PreAuthorize("@ss.hasPermission('statistics:trade:query')")
+    public CommonResult<List<DataComparisonRespVO<TradeOrderTrendRespVO>>> getOrderCountTrendComparison(@Valid TradeOrderTrendReqVO reqVO) {
+        return success(saleOrderService.getOrderCountTrendComparison(reqVO));
+    }
+
 }
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/trade/vo/TradeOrderCountRespVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/trade/vo/TradeOrderCountRespVO.java
index 2b012c8..b02e284 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/trade/vo/TradeOrderCountRespVO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/trade/vo/TradeOrderCountRespVO.java
@@ -7,16 +7,16 @@ import lombok.Data;
 @Data
 public class TradeOrderCountRespVO {
 
-    @Schema(description = "待发货", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    private Long undelivered;
+    @Schema(description = "已驳回", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Long orderCountAA;
 
-    @Schema(description = "待核销", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    private Long pickUp;
+    @Schema(description = "待提交", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Long orderCountA;
 
-    @Schema(description = "退款中", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    private Long afterSaleApply;
+    @Schema(description = "待审核", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Long orderCountB;
 
-    @Schema(description = "提现待审核", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    private Long auditingWithdraw;
+    @Schema(description = "已完成", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Long orderCountC;
 
 }
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/trade/vo/TradeOrderSummaryRespVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/trade/vo/TradeOrderSummaryRespVO.java
index dc18ae4..e8b6581 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/trade/vo/TradeOrderSummaryRespVO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/trade/vo/TradeOrderSummaryRespVO.java
@@ -3,14 +3,16 @@ package cn.hangtag.module.oms.controller.admin.trade.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Schema(description = "管理后台 - 交易订单统计 Response VO")
 @Data
 public class TradeOrderSummaryRespVO {
 
-    @Schema(description = "支付订单商品数", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    private Integer orderPayCount;
+    @Schema(description = "销售订单数", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Integer orderCount;
 
-    @Schema(description = "总支付金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    private Integer orderPayPrice;
+    @Schema(description = "销售订单额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private BigDecimal orderAmount;
 
 }
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/trade/vo/TradeOrderTrendRespVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/trade/vo/TradeOrderTrendRespVO.java
index c3b7af9..d829751 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/trade/vo/TradeOrderTrendRespVO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/trade/vo/TradeOrderTrendRespVO.java
@@ -11,9 +11,9 @@ public class TradeOrderTrendRespVO {
     private String date;
 
     @Schema(description = "订单数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    private Integer orderPayCount;
+    private Integer orderCount;
 
-    @Schema(description = "订单支付金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    private Integer orderPayPrice;
+    @Schema(description = "订单金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Integer orderAmount;
 
 }
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/convert/saleorder/SaleOrderConvert.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/convert/saleorder/SaleOrderConvert.java
new file mode 100644
index 0000000..f1dbb47
--- /dev/null
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/convert/saleorder/SaleOrderConvert.java
@@ -0,0 +1,54 @@
+package cn.hangtag.module.oms.convert.saleorder;
+
+
+import cn.hangtag.module.oms.controller.admin.customer.vo.CustomerRespVO;
+import cn.hangtag.module.oms.controller.admin.saleorder.vo.SaleOrderRemarkReqVO;
+import cn.hangtag.module.oms.controller.admin.saleorder.vo.SaleOrderRespVO;
+import cn.hangtag.module.oms.dal.dataobject.customer.CustomerDO;
+import cn.hangtag.module.oms.dal.dataobject.saleorder.SaleOrderDO;
+import cn.hangtag.module.system.api.user.dto.AdminUserRespDTO;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.Mappings;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+@Mapper
+public interface SaleOrderConvert {
+
+    SaleOrderConvert INSTANCE = Mappers.getMapper(SaleOrderConvert.class);
+    @Mappings({
+           // @Mapping(target = "id", ignore = true),
+            @Mapping(source = "invoiceCode", target = "invoiceCode"),
+            @Mapping(source = "invoiceName", target = "invoiceName"),
+            @Mapping(source = "address", target = "address")
+    })
+    SaleOrderRespVO convert(SaleOrderDO bean);
+
+
+    CustomerRespVO convert(CustomerDO bean);
+
+
+    SaleOrderDO convert(SaleOrderRemarkReqVO reqVO);
+
+
+
+    default SaleOrderRespVO convert(SaleOrderDO saleOrder, List<cn.hangtag.module.oms.dal.dataobject.saleorderentry.SaleOrderEntryDO> entrys, CustomerDO customer, AdminUserRespDTO updater, AdminUserRespDTO auditor){
+
+        SaleOrderRespVO orderVO = convert(saleOrder);
+        // 处理客户信息
+        orderVO.setCustomer(convert(customer));
+        if(updater!=null){
+            orderVO.setUpdaterName(updater.getNickname());
+        }
+        if(auditor!=null){
+            orderVO.setAuditorName(auditor.getNickname());
+        }
+        orderVO.setEntrys(entrys);
+        return orderVO;
+    }
+
+
+
+}
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/saleorder/SaleOrderDO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/saleorder/SaleOrderDO.java
index 56a331f..0ecd889 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/saleorder/SaleOrderDO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/saleorder/SaleOrderDO.java
@@ -1,6 +1,8 @@
 package cn.hangtag.module.oms.dal.dataobject.saleorder;
 
 import lombok.*;
+
+import java.math.BigDecimal;
 import java.util.*;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
@@ -74,6 +76,10 @@ public class SaleOrderDO extends BaseDO {
      * 传真
      */
     private String fax;
+    /**
+     * 订单总金额
+     */
+    private BigDecimal orderAmount;
     /**
      * 备注
      */
@@ -106,5 +112,13 @@ public class SaleOrderDO extends BaseDO {
      * 驳回原因
      */
     private String rejectReason;
+    /**
+     * 审核人
+     */
+    private String auditor;
+    /**
+     * 审核时间
+     */
+    private LocalDateTime auditorTime;
 
 }
\ No newline at end of file
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/saleorder/SaleOrderEntryDO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/saleorder/SaleOrderEntryDO.java
index 8b0efdb..4a89eaf 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/saleorder/SaleOrderEntryDO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/saleorder/SaleOrderEntryDO.java
@@ -46,9 +46,17 @@ public class SaleOrderEntryDO extends BaseDO {
      * 单价
      */
     private BigDecimal price;
+    /**
+     * 折扣率
+     */
+    private BigDecimal discount;
     /**
      * 数量
      */
     private Integer qty;
+    /**
+     * 金额
+     */
+    private BigDecimal amount;
 
 }
\ No newline at end of file
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/mysql/saleorder/SaleOrderMapper.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/mysql/saleorder/SaleOrderMapper.java
index 582fe33..357fd0d 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/mysql/saleorder/SaleOrderMapper.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/mysql/saleorder/SaleOrderMapper.java
@@ -5,6 +5,7 @@ import cn.hangtag.framework.mybatis.core.mapper.BaseMapperX;
 import cn.hangtag.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.hangtag.module.oms.controller.admin.saleorder.vo.SaleOrderPageReqVO;
 import cn.hangtag.module.oms.controller.admin.trade.vo.TradeOrderSummaryRespVO;
+import cn.hangtag.module.oms.controller.admin.trade.vo.TradeOrderTrendRespVO;
 import cn.hangtag.module.oms.dal.dataobject.saleorder.SaleOrderDO;
 import cn.hangtag.module.oms.enums.saleorder.SaleOrderStatusEnum;
 import cn.hutool.core.util.ObjectUtil;
@@ -12,6 +13,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * 销售订单 Mapper
@@ -65,7 +67,26 @@ public interface SaleOrderMapper extends BaseMapperX<SaleOrderDO> {
 
     TradeOrderSummaryRespVO selectOrderQtySummaryByOrderStatusAndCreateTimeBetween(@Param("orderStatus") String orderStatus,
                                                                                    @Param("beginTime") LocalDateTime beginTime,
-                                                                                   @Param("endTime") LocalDateTime endTime);
+                                                                                   @Param("endTime") LocalDateTime endTime,@Param("customerId") Long customerId);
 
 
+    /**
+     * 按照支付时间统计订单（按天分组）
+     *
+     * @param beginTime 支付起始时间
+     * @param endTime   支付截止时间
+     * @return 订单统计列表
+     */
+    List<TradeOrderTrendRespVO> selectListByPayTimeBetweenAndGroupByDay(@Param("beginTime") LocalDateTime beginTime,
+                                                                        @Param("endTime") LocalDateTime endTime);
+
+    /**
+     * 按照支付时间统计订单（按月分组）
+     *
+     * @param beginTime 支付起始时间
+     * @param endTime   支付截止时间
+     * @return 订单统计列表
+     */
+    List<TradeOrderTrendRespVO> selectListByPayTimeBetweenAndGroupByMonth(@Param("beginTime") LocalDateTime beginTime,
+                                                                          @Param("endTime") LocalDateTime endTime);
 }
\ No newline at end of file
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/customer/CustomerServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/customer/CustomerServiceImpl.java
index 8b87d1b..dd5da09 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/customer/CustomerServiceImpl.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/customer/CustomerServiceImpl.java
@@ -100,7 +100,7 @@ public class CustomerServiceImpl implements CustomerService {
         // 校验存在
         CustomerDO customerDO = validateCustomerExists(updateReqVO.getId());
 
-        if(StringUtils.isNotBlank(updateReqVO.getNumber()) && !customerDO.getNumber().equals(updateReqVO.getNumber())){//编码不一致
+        if(StringUtils.isNotBlank(updateReqVO.getNumber()) && !updateReqVO.getNumber().equals(customerDO.getNumber())){//编码不一致
             checkCode(customerDO.getId(),updateReqVO.getNumber());
         }else {
             updateReqVO.setNumber(customerDO.getNumber());
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderService.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderService.java
index 013983f..732348f 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderService.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderService.java
@@ -8,10 +8,11 @@ import javax.validation.*;
 import cn.hangtag.module.oms.controller.admin.common.vo.DataComparisonRespVO;
 import cn.hangtag.module.oms.controller.admin.saleorder.vo.*;
 import cn.hangtag.module.oms.controller.admin.trade.vo.TradeOrderSummaryRespVO;
+import cn.hangtag.module.oms.controller.admin.trade.vo.TradeOrderTrendReqVO;
+import cn.hangtag.module.oms.controller.admin.trade.vo.TradeOrderTrendRespVO;
 import cn.hangtag.module.oms.dal.dataobject.saleorder.SaleOrderDO;
 import cn.hangtag.module.oms.dal.dataobject.saleorderentry.SaleOrderEntryDO;
 import cn.hangtag.framework.common.pojo.PageResult;
-import cn.hangtag.framework.common.pojo.PageParam;
 
 /**
  * 销售订单 Service 接口
@@ -68,7 +69,7 @@ public interface SaleOrderService {
      */
     List<SaleOrderEntryDO> getSaleOrderEntryListByParentId(Long parentId);
 
-    Map<Integer, Long> getTabsCount();
+    Map<Integer, Long> getTabsCount(Long customerId);
 
     default void updateSaleOrderBillStatus(List<Long> ids, String status){
         updateSaleOrderBillStatus(ids,status,null);
@@ -79,10 +80,23 @@ public interface SaleOrderService {
 
     void generatePdf(HttpServletResponse response) throws IOException;
 
+    default DataComparisonRespVO<TradeOrderSummaryRespVO> getOrderComparison(){
+        return getOrderComparison(null);
+    }
     /**
      * 交易订单销售额对照
      *
      * @return 销售额对照
      */
-    DataComparisonRespVO<TradeOrderSummaryRespVO> getOrderComparison();
+    DataComparisonRespVO<TradeOrderSummaryRespVO> getOrderComparison(Long customerId);
+
+    void updateOrderRemark(SaleOrderRemarkReqVO reqVO);
+
+    default Long getCountByBillStatus(String value){
+        return getCountByBillStatus(value,null);
+    }
+
+    Long getCountByBillStatus(String value, Long customerId);
+
+    List<DataComparisonRespVO<TradeOrderTrendRespVO>> getOrderCountTrendComparison(TradeOrderTrendReqVO reqVO);
 }
\ No newline at end of file
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
index 704b8f6..053306e 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
@@ -1,18 +1,21 @@
 package cn.hangtag.module.oms.service.saleorder;
 
 import cn.hangtag.framework.common.exception.ServiceException;
-import cn.hangtag.framework.common.exception.enums.GlobalErrorCodeConstants;
 import cn.hangtag.framework.common.pojo.PageResult;
 import cn.hangtag.framework.common.util.object.BeanUtils;
+import cn.hangtag.framework.security.core.util.SecurityFrameworkUtils;
 import cn.hangtag.module.oms.common.utils.NumberChineseFormatterUtils;
 import cn.hangtag.module.oms.common.utils.WKHtmlToPdfUtil;
 import cn.hangtag.module.oms.controller.admin.common.vo.DataComparisonRespVO;
 import cn.hangtag.module.oms.controller.admin.produceorder.vo.ProduceOrderSaveReqVO;
 import cn.hangtag.module.oms.controller.admin.product.vo.ProductPriceSaveReqVO;
-import cn.hangtag.module.oms.controller.admin.salecontract.vo.SaleContractSaveReqVO;
 import cn.hangtag.module.oms.controller.admin.saleorder.vo.SaleOrderPageReqVO;
+import cn.hangtag.module.oms.controller.admin.saleorder.vo.SaleOrderRemarkReqVO;
 import cn.hangtag.module.oms.controller.admin.saleorder.vo.SaleOrderSaveReqVO;
 import cn.hangtag.module.oms.controller.admin.trade.vo.TradeOrderSummaryRespVO;
+import cn.hangtag.module.oms.controller.admin.trade.vo.TradeOrderTrendReqVO;
+import cn.hangtag.module.oms.controller.admin.trade.vo.TradeOrderTrendRespVO;
+import cn.hangtag.module.oms.convert.saleorder.SaleOrderConvert;
 import cn.hangtag.module.oms.dal.dataobject.customer.CustomerDO;
 import cn.hangtag.module.oms.dal.dataobject.product.ProductPriceDO;
 import cn.hangtag.module.oms.dal.dataobject.productinfo.ProductInfoDO;
@@ -23,6 +26,7 @@ import cn.hangtag.module.oms.dal.dataobject.saleorderentry.SaleOrderEntryDO;
 import cn.hangtag.module.oms.dal.mysql.saleorder.SaleOrderMapper;
 import cn.hangtag.module.oms.dal.mysql.saleorderentry.SaleOrderEntryMapper;
 import cn.hangtag.module.oms.enums.ErrorCodeConstants;
+import cn.hangtag.module.oms.enums.TimeRangeTypeEnum;
 import cn.hangtag.module.oms.enums.common.BillStatusEnum;
 import cn.hangtag.module.oms.enums.saleorder.SaleOrderStatusEnum;
 import cn.hangtag.module.oms.service.customer.CustomerService;
@@ -30,14 +34,15 @@ import cn.hangtag.module.oms.service.produceorder.ProduceOrderService;
 import cn.hangtag.module.oms.service.product.ProductPriceService;
 import cn.hangtag.module.oms.service.productinfo.ProductInfoService;
 import cn.hangtag.module.oms.service.salecontract.SaleContractService;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
@@ -46,15 +51,19 @@ import org.thymeleaf.context.Context;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotNull;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
+import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 import static cn.hangtag.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.hangtag.module.oms.enums.ErrorCodeConstants.SALE_ORDER_NOT_EXISTS;
@@ -94,7 +103,7 @@ public class SaleOrderServiceImpl implements SaleOrderService {
         saleOrder.setOrderStatus(SaleOrderStatusEnum.YXD.getValue());
         saleOrderMapper.insert(saleOrder);
         // 插入子表
-        createSaleOrderEntryList(saleOrder.getId(), createReqVO.getSaleOrderEntrys());
+        createSaleOrderEntryList(saleOrder.getId(), createReqVO.getEntrys());
         // 返回
         return saleOrder.getId();
     }
@@ -109,7 +118,7 @@ public class SaleOrderServiceImpl implements SaleOrderService {
         saleOrderMapper.updateById(updateObj);
 
         // 更新子表
-        updateSaleOrderEntryList(updateReqVO.getId(), updateReqVO.getSaleOrderEntrys());
+        updateSaleOrderEntryList(updateReqVO.getId(), updateReqVO.getEntrys());
     }
 
     @Override
@@ -159,17 +168,35 @@ public class SaleOrderServiceImpl implements SaleOrderService {
     }
 
     @Override
-    public Map<Integer, Long> getTabsCount() {
+    public Map<Integer, Long> getTabsCount(Long customerId) {
         Map<Integer, Long> counts = Maps.newLinkedHashMapWithExpectedSize(3);
+        LambdaQueryWrapper<SaleOrderDO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(SaleOrderDO::getOrderStatus, SaleOrderStatusEnum.YXD.getValue());
+        if(customerId!=null){
+            lambdaQueryWrapper.eq(SaleOrderDO::getCustomerId, customerId);
+        }
+
+        LambdaQueryWrapper<SaleOrderDO> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper1.eq(SaleOrderDO::getOrderStatus, SaleOrderStatusEnum.SCZ.getValue());
+        if(customerId!=null){
+            lambdaQueryWrapper1.eq(SaleOrderDO::getCustomerId, customerId);
+        }
+
+        LambdaQueryWrapper<SaleOrderDO> lambdaQueryWrapper2 = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper2.eq(SaleOrderDO::getOrderStatus, SaleOrderStatusEnum.YWC.getValue());
+        if(customerId!=null){
+            lambdaQueryWrapper2.eq(SaleOrderDO::getCustomerId, customerId);
+        }
+
         // 查询已下单订单数量
         counts.put(SaleOrderStatusEnum.YXD.getValue(),
-                saleOrderMapper.selectCount(SaleOrderDO::getOrderStatus, SaleOrderStatusEnum.YXD.getValue()));
+                saleOrderMapper.selectCount(lambdaQueryWrapper));
         // 查询已生产订单数量
         counts.put(SaleOrderStatusEnum.SCZ.getValue(),
-                saleOrderMapper.selectCount(SaleOrderDO::getOrderStatus, SaleOrderStatusEnum.SCZ.getValue()));
+                saleOrderMapper.selectCount(lambdaQueryWrapper1));
         // 查询已完成订单数量
         counts.put(SaleOrderStatusEnum.YWC.getValue(),
-                saleOrderMapper.selectCount(SaleOrderDO::getOrderStatus, SaleOrderStatusEnum.YWC.getValue()));
+                saleOrderMapper.selectCount(lambdaQueryWrapper2));
         return counts;
     }
 
@@ -208,10 +235,11 @@ public class SaleOrderServiceImpl implements SaleOrderService {
             case "audit":
                 for (SaleOrderDO saleOrder : saleOrders) {
                     if(BillStatusEnum.SUBMIT.getValue().equals(saleOrder.getBillStatus())){
-                        saleOrder.setBillStatus(BillStatusEnum.AUDIT.getValue());
-                        saleOrder.setOrderStatus(SaleOrderStatusEnum.YWC.getValue());
-                        saleOrderMapper.updateById(saleOrder);
+
                         List<SaleOrderEntryDO> entrys = getSaleOrderEntryListByParentId(saleOrder.getId());
+                        if(entrys==null||entrys.isEmpty()){
+                            throw new ServiceException(001,"产品明细为空");
+                        }
                         for (cn.hangtag.module.oms.dal.dataobject.saleorderentry.SaleOrderEntryDO entry : entrys) {
                             BigDecimal price = entry.getPrice();
                             if(price==null){
@@ -219,6 +247,14 @@ public class SaleOrderServiceImpl implements SaleOrderService {
                             }
                         }
 
+                        saleOrder.setBillStatus(BillStatusEnum.AUDIT.getValue());
+                        saleOrder.setOrderStatus(SaleOrderStatusEnum.YWC.getValue());
+                        Long userId = SecurityFrameworkUtils.getLoginUserId();
+                        saleOrder.setAuditor(userId.toString());
+                        saleOrder.setAuditorTime(LocalDateTime.now());
+                        saleOrderMapper.updateById(saleOrder);
+
+
                         //生成产品单价记录
                         for (cn.hangtag.module.oms.dal.dataobject.saleorderentry.SaleOrderEntryDO entry : entrys) {
                             Long parentId = entry.getParentId();
@@ -353,20 +389,84 @@ public class SaleOrderServiceImpl implements SaleOrderService {
     }
 
     @Override
-    public DataComparisonRespVO<TradeOrderSummaryRespVO> getOrderComparison() {
+    public DataComparisonRespVO<TradeOrderSummaryRespVO> getOrderComparison(Long customerId) {
+        LocalDateTime dayDate = LocalDateTime.now();
+        LocalDateTime lastDayDate = LocalDateTime.now().minusDays(1);
+        LocalDateTime beginWeekDate = DateUtil.beginOfWeek(DateUtil.date()).toLocalDateTime();
+        LocalDateTime endWeekDate = DateUtil.endOfWeek(DateUtil.date()).toLocalDateTime();
+        LocalDateTime lastBeginWeekDate = DateUtil.beginOfWeek(DateUtil.lastWeek()).toLocalDateTime();
+        LocalDateTime lastEndWeekDate = DateUtil.endOfWeek(DateUtil.lastWeek()).toLocalDateTime();
+
         return new DataComparisonRespVO<TradeOrderSummaryRespVO>()
-                .setValue(getOrderQtySummary(LocalDateTime.now()))
-                .setReference(getOrderQtySummary(LocalDateTime.now().minusDays(1)));
+                .setValue(getOrderQtySummary(dayDate,dayDate,customerId))//今日
+                .setReference(getOrderQtySummary(lastDayDate,lastDayDate,customerId))//昨日
+                .setValue2(getOrderQtySummary(beginWeekDate,endWeekDate,customerId))//本周
+                .setReference2(getOrderQtySummary(lastBeginWeekDate,lastEndWeekDate,customerId));//上周
     }
 
-    private TradeOrderSummaryRespVO getOrderQtySummary(LocalDateTime date) {
-        LocalDateTime beginTime = LocalDateTimeUtil.beginOfDay(date);
-        LocalDateTime endTime = LocalDateTimeUtil.endOfDay(date);
+    @Override
+    public void updateOrderRemark(SaleOrderRemarkReqVO reqVO) {
+        // 校验并获得交易订单
+        validateOrderExists(reqVO.getId());
+
+        // 更新
+        SaleOrderDO order = SaleOrderConvert.INSTANCE.convert(reqVO);
+        saleOrderMapper.updateById(order);
+    }
+
+    @Override
+    public Long getCountByBillStatus(String billstatus, Long customerId) {
+        LambdaQueryWrapper<SaleOrderDO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(SaleOrderDO::getBillStatus,billstatus);
+        if(customerId!=null){
+            lambdaQueryWrapper.eq(SaleOrderDO::getCustomerId,customerId);
+        }
+        return saleOrderMapper.selectCount(lambdaQueryWrapper);
+    }
+
+    @Override
+    public List<DataComparisonRespVO<TradeOrderTrendRespVO>> getOrderCountTrendComparison(TradeOrderTrendReqVO reqVO) {
+        // 查询当前数据
+        List<TradeOrderTrendRespVO> value = getOrderCountTrend(reqVO.getType(), reqVO.getBeginTime(), reqVO.getEndTime());
+        // 查询对照数据
+        LocalDateTime referenceEndTime = reqVO.getBeginTime().minusDays(1);
+        LocalDateTime referenceBeginTime = referenceEndTime.minus(Duration.between(reqVO.getBeginTime(), reqVO.getEndTime()));
+        List<TradeOrderTrendRespVO> reference = getOrderCountTrend(reqVO.getType(), referenceBeginTime, referenceEndTime);
+        // 顺序对比返回
+        return IntStream.range(0, value.size())
+                .mapToObj(index -> new DataComparisonRespVO<TradeOrderTrendRespVO>()
+                        .setValue(CollUtil.get(value, index))
+                        .setReference(CollUtil.get(reference, index)))
+                .collect(Collectors.toList());
+    }
+
+    private List<TradeOrderTrendRespVO> getOrderCountTrend(Integer timeRangeType, LocalDateTime beginTime, LocalDateTime endTime) {
+        // 情况一：按年统计时，以月份分组
+        if (TimeRangeTypeEnum.YEAR.getType().equals(timeRangeType)) {
+            return saleOrderMapper.selectListByPayTimeBetweenAndGroupByMonth(beginTime, endTime);
+        }
+        // 情况二：其它以天分组（天、周、月）
+        return saleOrderMapper.selectListByPayTimeBetweenAndGroupByDay(beginTime, endTime);
+    }
+
+    private TradeOrderSummaryRespVO getOrderQtySummary(LocalDateTime beginDate, LocalDateTime endDate, Long customerId) {
+        LocalDateTime beginTime = LocalDateTimeUtil.beginOfDay(beginDate);
+        LocalDateTime endTime = LocalDateTimeUtil.endOfDay(endDate);
         return saleOrderMapper.selectOrderQtySummaryByOrderStatusAndCreateTimeBetween(
-                null, beginTime, endTime);
+                null, beginTime, endTime,customerId);
     }
 
 
+    @NotNull
+    private SaleOrderDO validateOrderExists(Long id) {
+        // 校验订单是否存在
+        SaleOrderDO order = saleOrderMapper.selectById(id);
+        if (order == null) {
+            throw exception(SALE_ORDER_NOT_EXISTS);
+        }
+        return order;
+    }
+
     private void createSaleOrderEntryList(Long parentId, List<SaleOrderEntryDO> list) {
         list.forEach(o -> o.setParentId(parentId));
         saleOrderEntryMapper.insertBatch(list);
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/mapper/saleorder/SaleOrderMapper.xml b/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/mapper/saleorder/SaleOrderMapper.xml
index 9ae5384..f6f4b12 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/mapper/saleorder/SaleOrderMapper.xml
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/mapper/saleorder/SaleOrderMapper.xml
@@ -6,16 +6,46 @@
     <select id="selectOrderQtySummaryByOrderStatusAndCreateTimeBetween"
             resultType="cn.hangtag.module.oms.controller.admin.trade.vo.TradeOrderSummaryRespVO">
 
-        SELECT IFNULL(SUM(0), 0) AS orderPayPrice,
-               COUNT(1)                  AS orderPayCount
+        SELECT IFNULL(SUM(0), 0) AS orderCount,
+               COUNT(1)                  AS orderAmount
         FROM oms_saleorder
         WHERE deleted = FALSE
           <if test="orderStatus != null">
               AND order_status = #{orderStatus}
           </if>
+            <if test="customerId != null">
+                AND customer_id = #{customerId}
+            </if>
           AND create_time BETWEEN #{beginTime} AND #{endTime}
     </select>
 
 
+    <select id="selectListByPayTimeBetweenAndGroupByDay"
+            resultType="cn.hangtag.module.oms.controller.admin.trade.vo.TradeOrderTrendRespVO">
+        SELECT DATE_FORMAT(create_time, '%Y-%m-%d') AS date,
+               COUNT(1)                          AS orderCount,
+               SUM(order_amount)                    AS orderAmount
+        FROM oms_saleorder
+        WHERE bill_status = 'C'
+          AND create_time BETWEEN #{beginTime} AND #{endTime}
+          AND deleted = FALSE
+        GROUP BY date
+    </select>
+
+
+    <select id="selectListByPayTimeBetweenAndGroupByMonth"
+            resultType="cn.hangtag.module.oms.controller.admin.trade.vo.TradeOrderTrendRespVO">
+
+        SELECT DATE_FORMAT(create_time, '%Y-%m') AS date,
+               COUNT(1)                       AS orderCount,
+               SUM(order_amount)                 AS orderAmount
+        FROM oms_saleorder
+        WHERE bill_status = 'C'
+          AND create_time BETWEEN #{beginTime} AND #{endTime}
+          AND deleted = FALSE
+        GROUP BY date
+    </select>
+
+
 
 </mapper>
\ No newline at end of file
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/test/java/cn/hangtag/module/oms/service/product/ProductPriceServiceImplTest.java b/hangtag-module-oms/hangtag-module-oms-biz/src/test/java/cn/hangtag/module/oms/service/product/ProductPriceServiceImplTest.java
deleted file mode 100644
index 540c69c..0000000
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/test/java/cn/hangtag/module/oms/service/product/ProductPriceServiceImplTest.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package cn.hangtag.module.oms.service.product;
-
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.mock.mockito.MockBean;
-
-import javax.annotation.Resource;
-
-import cn.hangtag.framework.test.core.ut.BaseDbUnitTest;
-
-import cn.hangtag.module.oms.controller.admin.product.vo.*;
-import cn.hangtag.module.oms.dal.dataobject.product.ProductPriceDO;
-import cn.hangtag.module.oms.dal.mysql.product.ProductPriceMapper;
-import cn.hangtag.framework.common.pojo.PageResult;
-
-import javax.annotation.Resource;
-import org.springframework.context.annotation.Import;
-import java.util.*;
-import java.time.LocalDateTime;
-
-import static cn.hutool.core.util.RandomUtil.*;
-import static cn.hangtag.module.oms.enums.ErrorCodeConstants.*;
-import static cn.hangtag.framework.test.core.util.AssertUtils.*;
-import static cn.hangtag.framework.test.core.util.RandomUtils.*;
-import static cn.hangtag.framework.common.util.date.LocalDateTimeUtils.*;
-import static cn.hangtag.framework.common.util.object.ObjectUtils.*;
-import static cn.hangtag.framework.common.util.date.DateUtils.*;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-/**
- * {@link ProductPriceServiceImpl} 的单元测试类
- *
- * @author wwb
- */
-@Import(ProductPriceServiceImpl.class)
-public class ProductPriceServiceImplTest extends BaseDbUnitTest {
-
-    @Resource
-    private ProductPriceServiceImpl productPriceService;
-
-    @Resource
-    private ProductPriceMapper productPriceMapper;
-
-    @Test
-    public void testCreateProductPrice_success() {
-        // 准备参数
-        ProductPriceSaveReqVO createReqVO = randomPojo(ProductPriceSaveReqVO.class).setId(null);
-
-        // 调用
-        Integer productPriceId = productPriceService.createProductPrice(createReqVO);
-        // 断言
-        assertNotNull(productPriceId);
-        // 校验记录的属性是否正确
-        ProductPriceDO productPrice = productPriceMapper.selectById(productPriceId);
-        assertPojoEquals(createReqVO, productPrice, "id");
-    }
-
-    @Test
-    public void testUpdateProductPrice_success() {
-        // mock 数据
-        ProductPriceDO dbProductPrice = randomPojo(ProductPriceDO.class);
-        productPriceMapper.insert(dbProductPrice);// @Sql: 先插入出一条存在的数据
-        // 准备参数
-        ProductPriceSaveReqVO updateReqVO = randomPojo(ProductPriceSaveReqVO.class, o -> {
-            o.setId(dbProductPrice.getId()); // 设置更新的 ID
-        });
-
-        // 调用
-        productPriceService.updateProductPrice(updateReqVO);
-        // 校验是否更新正确
-        ProductPriceDO productPrice = productPriceMapper.selectById(updateReqVO.getId()); // 获取最新的
-        assertPojoEquals(updateReqVO, productPrice);
-    }
-
-    @Test
-    public void testUpdateProductPrice_notExists() {
-        // 准备参数
-        ProductPriceSaveReqVO updateReqVO = randomPojo(ProductPriceSaveReqVO.class);
-
-        // 调用, 并断言异常
-        assertServiceException(() -> productPriceService.updateProductPrice(updateReqVO), PRODUCT_PRICE_NOT_EXISTS);
-    }
-
-    @Test
-    public void testDeleteProductPrice_success() {
-        // mock 数据
-        ProductPriceDO dbProductPrice = randomPojo(ProductPriceDO.class);
-        productPriceMapper.insert(dbProductPrice);// @Sql: 先插入出一条存在的数据
-        // 准备参数
-        Integer id = dbProductPrice.getId();
-
-        // 调用
-        productPriceService.deleteProductPrice(id);
-       // 校验数据不存在了
-       assertNull(productPriceMapper.selectById(id));
-    }
-
-    @Test
-    public void testDeleteProductPrice_notExists() {
-        // 准备参数
-        Integer id = randomIntegerId();
-
-        // 调用, 并断言异常
-        assertServiceException(() -> productPriceService.deleteProductPrice(id), PRODUCT_PRICE_NOT_EXISTS);
-    }
-
-    @Test
-    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
-    public void testGetProductPricePage() {
-       // mock 数据
-       ProductPriceDO dbProductPrice = randomPojo(ProductPriceDO.class, o -> { // 等会查询到
-           o.setProductId(null);
-           o.setPrice(null);
-           o.setCreateTime(null);
-       });
-       productPriceMapper.insert(dbProductPrice);
-       // 测试 productId 不匹配
-       productPriceMapper.insert(cloneIgnoreId(dbProductPrice, o -> o.setProductId(null)));
-       // 测试 price 不匹配
-       productPriceMapper.insert(cloneIgnoreId(dbProductPrice, o -> o.setPrice(null)));
-       // 测试 createTime 不匹配
-       productPriceMapper.insert(cloneIgnoreId(dbProductPrice, o -> o.setCreateTime(null)));
-       // 准备参数
-       ProductPricePageReqVO reqVO = new ProductPricePageReqVO();
-       reqVO.setProductId(null);
-       reqVO.setPrice(null);
-       reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
-
-       // 调用
-       PageResult<ProductPriceDO> pageResult = productPriceService.getProductPricePage(reqVO);
-       // 断言
-       assertEquals(1, pageResult.getTotal());
-       assertEquals(1, pageResult.getList().size());
-       assertPojoEquals(dbProductPrice, pageResult.getList().get(0));
-    }
-
-}
\ No newline at end of file
diff --git a/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/controller/admin/auth/AuthController.java b/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/controller/admin/auth/AuthController.java
index 34da094..e3c4ea6 100644
--- a/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/controller/admin/auth/AuthController.java
+++ b/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/controller/admin/auth/AuthController.java
@@ -103,6 +103,14 @@ public class AuthController {
             return success(null);
         }
 
+        if(user.getDeptId()==999999L){//当前账号等于客户类型
+            AuthPermissionInfoRespVO convert = AuthConvert.INSTANCE.convert(user, null, null);
+            String customerMenuJson = ResourceUtil.readUtf8Str("json/customer_menu.json");
+            List<AuthPermissionInfoRespVO.MenuVO> list = JSONUtil.toList(customerMenuJson, AuthPermissionInfoRespVO.MenuVO.class);
+            convert.setMenus(list);
+            return success(convert);
+        }
+
         // 1.2 获得角色列表
         Set<Long> roleIds = permissionService.getUserRoleIdListByUserId(getLoginUserId());
         if (CollUtil.isEmpty(roleIds)) {
@@ -117,11 +125,6 @@ public class AuthController {
         menuList.removeIf(menu -> !CommonStatusEnum.ENABLE.getStatus().equals(menu.getStatus())); // 移除禁用的菜单
 
         AuthPermissionInfoRespVO convert = AuthConvert.INSTANCE.convert(user, roles, menuList);
-        if(user.getDeptId()==999999L){//当前账号等于客户类型
-            String customerMenuJson = ResourceUtil.readUtf8Str("json/customer_menu.json");
-            List<AuthPermissionInfoRespVO.MenuVO> list = JSONUtil.toList(customerMenuJson, AuthPermissionInfoRespVO.MenuVO.class);
-            convert.setMenus(list);
-        }
         // 2. 拼接结果返回
         return success(convert);
     }
diff --git a/hangtag-module-system/hangtag-module-system-biz/src/main/resources/json/customer_menu.json b/hangtag-module-system/hangtag-module-system-biz/src/main/resources/json/customer_menu.json
index 1a87907..1276005 100644
--- a/hangtag-module-system/hangtag-module-system-biz/src/main/resources/json/customer_menu.json
+++ b/hangtag-module-system/hangtag-module-system-biz/src/main/resources/json/customer_menu.json
@@ -11,6 +11,19 @@
     "keepAlive": true,
     "alwaysShow": true,
     "children": [
+      {
+        "id": 2830,
+        "parentId": 2828,
+        "name": "销售订单",
+        "path": "sale-order",
+        "component": "oms/saleorder/index",
+        "componentName": "SaleOrder",
+        "icon": "",
+        "visible": true,
+        "keepAlive": true,
+        "alwaysShow": true,
+        "children": null
+      },
       {
         "id": 2818,
         "parentId": 2804,
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService b/hangtag-module-system/hangtag-module-system-biz/target/classes/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService
deleted file mode 100644
index 0f3d6ba..0000000
--- a/hangtag-module-system/hangtag-module-system-biz/target/classes/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService
+++ /dev/null
@@ -1 +0,0 @@
-cn.hangtag.module.system.framework.captcha.core.RedisCaptchaServiceImpl
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/META-INF/spring-configuration-metadata.json b/hangtag-module-system/hangtag-module-system-biz/target/classes/META-INF/spring-configuration-metadata.json
deleted file mode 100644
index b7eda8c..0000000
--- a/hangtag-module-system/hangtag-module-system-biz/target/classes/META-INF/spring-configuration-metadata.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "groups": [
-    {
-      "name": "hangtag.sms-code",
-      "type": "cn.hangtag.module.system.framework.sms.config.SmsCodeProperties",
-      "sourceType": "cn.hangtag.module.system.framework.sms.config.SmsCodeProperties"
-    }
-  ],
-  "properties": [
-    {
-      "name": "hangtag.sms-code.begin-code",
-      "type": "java.lang.Integer",
-      "description": "验证码最小值",
-      "sourceType": "cn.hangtag.module.system.framework.sms.config.SmsCodeProperties"
-    },
-    {
-      "name": "hangtag.sms-code.end-code",
-      "type": "java.lang.Integer",
-      "description": "验证码最大值",
-      "sourceType": "cn.hangtag.module.system.framework.sms.config.SmsCodeProperties"
-    },
-    {
-      "name": "hangtag.sms-code.expire-times",
-      "type": "java.time.Duration",
-      "description": "过期时间",
-      "sourceType": "cn.hangtag.module.system.framework.sms.config.SmsCodeProperties"
-    },
-    {
-      "name": "hangtag.sms-code.send-frequency",
-      "type": "java.time.Duration",
-      "description": "短信发送频率",
-      "sourceType": "cn.hangtag.module.system.framework.sms.config.SmsCodeProperties"
-    },
-    {
-      "name": "hangtag.sms-code.send-maximum-quantity-per-day",
-      "type": "java.lang.Integer",
-      "description": "每日发送最大数量",
-      "sourceType": "cn.hangtag.module.system.framework.sms.config.SmsCodeProperties"
-    }
-  ],
-  "hints": []
-}
\ No newline at end of file
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/original/bg1.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/original/bg1.png
deleted file mode 100644
index c481457..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/original/bg1.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/original/bg2.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/original/bg2.png
deleted file mode 100644
index bf8fb38..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/original/bg2.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/original/bg3.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/original/bg3.png
deleted file mode 100644
index f871d3d..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/original/bg3.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/original/bg4.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/original/bg4.png
deleted file mode 100644
index 2e3d871..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/original/bg4.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/original/bg5.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/original/bg5.png
deleted file mode 100644
index fe383b7..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/original/bg5.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/original/bg6.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/original/bg6.png
deleted file mode 100644
index 5024ceb..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/original/bg6.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/original/bg7.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/original/bg7.png
deleted file mode 100644
index efe76f8..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/original/bg7.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/original/bg8.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/original/bg8.png
deleted file mode 100644
index 2727aa3..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/original/bg8.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/original/bg9.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/original/bg9.png
deleted file mode 100644
index 4463aa2..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/original/bg9.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/1.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/1.png
deleted file mode 100644
index ef11324..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/1.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/10.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/10.png
deleted file mode 100644
index 297e44c..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/10.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/11.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/11.png
deleted file mode 100644
index d9b1da8..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/11.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/12.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/12.png
deleted file mode 100644
index 07e7313..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/12.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/13.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/13.png
deleted file mode 100644
index 82c3dd9..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/13.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/14.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/14.png
deleted file mode 100644
index 0b9a866..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/14.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/15.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/15.png
deleted file mode 100644
index 86b0d1c..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/15.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/16.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/16.png
deleted file mode 100644
index e90a6e2..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/16.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/17.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/17.png
deleted file mode 100644
index a82cbc7..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/17.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/18.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/18.png
deleted file mode 100644
index d3f3cfd..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/18.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/19.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/19.png
deleted file mode 100644
index eb2855b..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/19.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/8.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/8.png
deleted file mode 100644
index 3cb5ce1..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/8.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/9.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/9.png
deleted file mode 100644
index 384d354..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/11/9.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/2.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/2.png
deleted file mode 100644
index baf3f06..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/2.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/3.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/3.png
deleted file mode 100644
index ccaf617..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/3.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/4.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/4.png
deleted file mode 100644
index 7dab162..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/jigsaw/slidingBlock/4.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg1.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg1.png
deleted file mode 100644
index 14e7345..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg1.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg10.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg10.png
deleted file mode 100644
index 1ea1d6d..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg10.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg2.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg2.png
deleted file mode 100644
index 0edb329..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg2.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg3.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg3.png
deleted file mode 100644
index 9167996..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg3.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg4.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg4.png
deleted file mode 100644
index e8e8e6c..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg4.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg5.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg5.png
deleted file mode 100644
index 66a3181..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg5.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg6.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg6.png
deleted file mode 100644
index 9b0f5d8..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg6.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg7.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg7.png
deleted file mode 100644
index db41c74..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg7.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg8.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg8.png
deleted file mode 100644
index 3496813..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg8.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg9.png b/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg9.png
deleted file mode 100644
index 4e7b477..0000000
Binary files a/hangtag-module-system/hangtag-module-system-biz/target/classes/images/pic-click/bg9.png and /dev/null differ
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/generated-sources/annotations/cn/hangtag/module/system/convert/oauth2/OAuth2OpenConvertImpl.java b/hangtag-module-system/hangtag-module-system-biz/target/generated-sources/annotations/cn/hangtag/module/system/convert/oauth2/OAuth2OpenConvertImpl.java
deleted file mode 100644
index 062eeb5..0000000
--- a/hangtag-module-system/hangtag-module-system-biz/target/generated-sources/annotations/cn/hangtag/module/system/convert/oauth2/OAuth2OpenConvertImpl.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package cn.hangtag.module.system.convert.oauth2;
-
-import javax.annotation.Generated;
-
-@Generated(
-    value = "org.mapstruct.ap.MappingProcessor",
-    date = "2024-09-15T11:57:57+0800",
-    comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_401 (Oracle Corporation)"
-)
-public class OAuth2OpenConvertImpl implements OAuth2OpenConvert {
-}
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/generated-sources/annotations/cn/hangtag/module/system/convert/social/SocialUserConvertImpl.java b/hangtag-module-system/hangtag-module-system-biz/target/generated-sources/annotations/cn/hangtag/module/system/convert/social/SocialUserConvertImpl.java
deleted file mode 100644
index 54951a9..0000000
--- a/hangtag-module-system/hangtag-module-system-biz/target/generated-sources/annotations/cn/hangtag/module/system/convert/social/SocialUserConvertImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package cn.hangtag.module.system.convert.social;
-
-import cn.hangtag.module.system.api.social.dto.SocialUserBindReqDTO;
-import cn.hangtag.module.system.controller.admin.socail.vo.user.SocialUserBindReqVO;
-import javax.annotation.Generated;
-
-@Generated(
-    value = "org.mapstruct.ap.MappingProcessor",
-    date = "2024-09-15T11:57:57+0800",
-    comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_401 (Oracle Corporation)"
-)
-public class SocialUserConvertImpl implements SocialUserConvert {
-
-    @Override
-    public SocialUserBindReqDTO convert(Long userId, Integer userType, SocialUserBindReqVO reqVO) {
-        if ( userId == null && userType == null && reqVO == null ) {
-            return null;
-        }
-
-        SocialUserBindReqDTO socialUserBindReqDTO = new SocialUserBindReqDTO();
-
-        if ( reqVO != null ) {
-            socialUserBindReqDTO.setSocialType( reqVO.getType() );
-            socialUserBindReqDTO.setCode( reqVO.getCode() );
-            socialUserBindReqDTO.setState( reqVO.getState() );
-        }
-        socialUserBindReqDTO.setUserId( userId );
-        socialUserBindReqDTO.setUserType( userType );
-
-        return socialUserBindReqDTO;
-    }
-}
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/test-classes/application-unit-test.yaml b/hangtag-module-system/hangtag-module-system-biz/target/test-classes/application-unit-test.yaml
deleted file mode 100644
index e58b30b..0000000
--- a/hangtag-module-system/hangtag-module-system-biz/target/test-classes/application-unit-test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-spring:
-  main:
-    lazy-initialization: true # 开启懒加载，加快速度
-    banner-mode: off # 单元测试，禁用 Banner
-
---- #################### 数据库相关配置 ####################
-
-spring:
-  # 数据源配置项
-  datasource:
-    name: ruoyi-vue-pro
-    url: jdbc:h2:mem:testdb;MODE=MYSQL;DATABASE_TO_UPPER=false;NON_KEYWORDS=value; # MODE 使用 MySQL 模式；DATABASE_TO_UPPER 配置表和字段使用小写
-    driver-class-name: org.h2.Driver
-    username: sa
-    password:
-    druid:
-      async-init: true # 单元测试，异步初始化 Druid 连接池，提升启动速度
-      initial-size: 1 # 单元测试，配置为 1，提升启动速度
-  sql:
-    init:
-      schema-locations: classpath:/sql/create_tables.sql
-
-  # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
-  redis:
-    host: 127.0.0.1 # 地址
-    port: 16379 # 端口（单元测试，使用 16379 端口）
-    database: 0 # 数据库索引
-
-
-mybatis:
-  lazy-initialization: true # 单元测试，设置 MyBatis Mapper 延迟加载，加速每个单元测试
-
---- #################### 定时任务相关配置 ####################
-
---- #################### 配置中心相关配置 ####################
-
---- #################### 服务保障相关配置 ####################
-
-# Lock4j 配置项（单元测试，禁用 Lock4j）
-
---- #################### 监控相关配置 ####################
-
---- #################### 芋道相关配置 ####################
-
-# 芋道配置项，设置当前项目所有自定义的配置
-hangtag:
-  info:
-    base-package: cn.hangtag.module
-  captcha:
-    timeout: 5m
-    width: 160
-    height: 60
-    enable: true
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/test-classes/logback.xml b/hangtag-module-system/hangtag-module-system-biz/target/test-classes/logback.xml
deleted file mode 100644
index daf756b..0000000
--- a/hangtag-module-system/hangtag-module-system-biz/target/test-classes/logback.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<configuration>
-    <!-- 引用 Spring Boot 的 logback 基础配置 -->
-    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
-</configuration>
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/test-classes/sql/clean.sql b/hangtag-module-system/hangtag-module-system-biz/target/test-classes/sql/clean.sql
deleted file mode 100644
index e7946a1..0000000
--- a/hangtag-module-system/hangtag-module-system-biz/target/test-classes/sql/clean.sql
+++ /dev/null
@@ -1,33 +0,0 @@
-DELETE FROM "system_dept";
-DELETE FROM "system_dict_data";
-DELETE FROM "system_role";
-DELETE FROM "system_role_menu";
-DELETE FROM "system_menu";
-DELETE FROM "system_user_role";
-DELETE FROM "system_dict_type";
-DELETE FROM "system_user_session";
-DELETE FROM "system_post";
-DELETE FROM "system_user_post";
-DELETE FROM "system_notice";
-DELETE FROM "system_login_log";
-DELETE FROM "system_operate_log";
-DELETE FROM "system_users";
-DELETE FROM "system_sms_channel";
-DELETE FROM "system_sms_template";
-DELETE FROM "system_sms_log";
-DELETE FROM "system_sms_code";
-DELETE FROM "system_social_client";
-DELETE FROM "system_social_user";
-DELETE FROM "system_social_user_bind";
-DELETE FROM "system_tenant";
-DELETE FROM "system_tenant_package";
-DELETE FROM "system_oauth2_client";
-DELETE FROM "system_oauth2_approve";
-DELETE FROM "system_oauth2_access_token";
-DELETE FROM "system_oauth2_refresh_token";
-DELETE FROM "system_oauth2_code";
-DELETE FROM "system_mail_account";
-DELETE FROM "system_mail_template";
-DELETE FROM "system_mail_log";
-DELETE FROM "system_notify_template";
-DELETE FROM "system_notify_message";
diff --git a/hangtag-module-system/hangtag-module-system-biz/target/test-classes/sql/create_tables.sql b/hangtag-module-system/hangtag-module-system-biz/target/test-classes/sql/create_tables.sql
deleted file mode 100644
index 4b566bf..0000000
--- a/hangtag-module-system/hangtag-module-system-biz/target/test-classes/sql/create_tables.sql
+++ /dev/null
@@ -1,614 +0,0 @@
-CREATE TABLE IF NOT EXISTS "system_dept" (
-    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "name" varchar(30) NOT NULL DEFAULT '',
-    "parent_id" bigint NOT NULL DEFAULT '0',
-    "sort" int NOT NULL DEFAULT '0',
-    "leader_user_id" bigint DEFAULT NULL,
-    "phone" varchar(11) DEFAULT NULL,
-    "email" varchar(50) DEFAULT NULL,
-    "status" tinyint NOT NULL,
-    "creator" varchar(64) DEFAULT '',
-    "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updater" varchar(64) DEFAULT '',
-    "update_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "deleted" bit NOT NULL DEFAULT FALSE,
-    "tenant_id" bigint not null default  '0',
-    PRIMARY KEY ("id")
-) COMMENT '部门表';
-
-CREATE TABLE IF NOT EXISTS "system_dict_data" (
-    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "sort" int NOT NULL DEFAULT '0',
-    "label" varchar(100) NOT NULL DEFAULT '',
-    "value" varchar(100) NOT NULL DEFAULT '',
-    "dict_type" varchar(100) NOT NULL DEFAULT '',
-    "status" tinyint NOT NULL DEFAULT '0',
-    "color_type" varchar(100) NOT NULL DEFAULT '',
-    "css_class" varchar(100) NOT NULL DEFAULT '',
-    "remark" varchar(500) DEFAULT NULL,
-    "creator" varchar(64) DEFAULT '',
-    "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updater" varchar(64) DEFAULT '',
-    "update_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "deleted" bit NOT NULL DEFAULT FALSE,
-    PRIMARY KEY ("id")
-) COMMENT '字典数据表';
-
-CREATE TABLE IF NOT EXISTS "system_role" (
-    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "name" varchar(30) NOT NULL,
-    "code" varchar(100) NOT NULL,
-    "sort" int NOT NULL,
-    "data_scope" tinyint NOT NULL DEFAULT '1',
-    "data_scope_dept_ids" varchar(500) NOT NULL DEFAULT '',
-    "status" tinyint NOT NULL,
-    "type" tinyint NOT NULL,
-    "remark" varchar(500) DEFAULT NULL,
-    "creator" varchar(64) DEFAULT '',
-    "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updater" varchar(64) DEFAULT '',
-    "update_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "deleted" bit NOT NULL DEFAULT FALSE,
-    "tenant_id" bigint not null default  '0',
-    PRIMARY KEY ("id")
-) COMMENT '角色信息表';
-
-CREATE TABLE IF NOT EXISTS "system_role_menu" (
-    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "role_id" bigint NOT NULL,
-    "menu_id" bigint NOT NULL,
-    "creator" varchar(64) DEFAULT '',
-    "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updater" varchar(64) DEFAULT '',
-    "update_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "deleted" bit NOT NULL DEFAULT FALSE,
-    "tenant_id" bigint not null default  '0',
-    PRIMARY KEY ("id")
-) COMMENT '角色和菜单关联表';
-
-CREATE TABLE IF NOT EXISTS "system_menu" (
-    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "name" varchar(50) NOT NULL,
-    "permission" varchar(100) NOT NULL DEFAULT '',
-    "type" tinyint NOT NULL,
-    "sort" int NOT NULL DEFAULT '0',
-    "parent_id" bigint NOT NULL DEFAULT '0',
-    "path" varchar(200) DEFAULT '',
-    "icon" varchar(100) DEFAULT '#',
-    "component" varchar(255) DEFAULT NULL,
-    "component_name" varchar(255) DEFAULT NULL,
-    "status" tinyint NOT NULL DEFAULT '0',
-    "visible" bit NOT NULL DEFAULT TRUE,
-    "keep_alive" bit NOT NULL DEFAULT TRUE,
-    "always_show" bit NOT NULL DEFAULT TRUE,
-    "creator" varchar(64) DEFAULT '',
-    "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updater" varchar(64) DEFAULT '',
-    "update_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "deleted" bit NOT NULL DEFAULT FALSE,
-    PRIMARY KEY ("id")
-) COMMENT '菜单权限表';
-
-CREATE TABLE IF NOT EXISTS "system_user_role" (
-     "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-     "user_id" bigint NOT NULL,
-     "role_id" bigint NOT NULL,
-     "creator" varchar(64) DEFAULT '',
-     "create_time" timestamp DEFAULT NULL,
-     "updater" varchar(64) DEFAULT '',
-     "update_time" timestamp DEFAULT NULL,
-     "deleted" bit DEFAULT FALSE,
-    "tenant_id" bigint not null default  '0',
-    PRIMARY KEY ("id")
-) COMMENT '用户和角色关联表';
-
-CREATE TABLE IF NOT EXISTS "system_dict_type" (
-    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "name" varchar(100) NOT NULL DEFAULT '',
-    "type" varchar(100) NOT NULL DEFAULT '',
-    "status" tinyint NOT NULL DEFAULT '0',
-    "remark" varchar(500) DEFAULT NULL,
-    "creator" varchar(64) DEFAULT '',
-    "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updater" varchar(64) DEFAULT '',
-    "update_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "deleted" bit NOT NULL DEFAULT FALSE,
-    "deleted_time" timestamp NOT NULL,
-    PRIMARY KEY ("id")
-) COMMENT '字典类型表';
-
-CREATE TABLE IF NOT EXISTS `system_user_session` (
-    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    `token` varchar(32) NOT NULL,
-    `user_id` bigint DEFAULT NULL,
-    "user_type" tinyint NOT NULL,
-    `username` varchar(50) NOT NULL DEFAULT '',
-    `user_ip` varchar(50) DEFAULT NULL,
-    `user_agent` varchar(512) DEFAULT NULL,
-    `session_timeout` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "creator" varchar(64) DEFAULT '',
-    "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    `updater` varchar(64) DEFAULT '' ,
-    "update_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "deleted" bit NOT NULL DEFAULT FALSE,
-    "tenant_id" bigint not null default  '0',
-    PRIMARY KEY (`id`)
-) COMMENT '用户在线 Session';
-
-CREATE TABLE IF NOT EXISTS "system_post" (
-    "id"          bigint      NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "code"        varchar(64) NOT NULL,
-    "name"        varchar(50) NOT NULL,
-    "sort"        integer     NOT NULL,
-    "status"      tinyint     NOT NULL,
-    "remark"      varchar(500)         DEFAULT NULL,
-    "creator"     varchar(64)          DEFAULT '',
-    "create_time" timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updater"     varchar(64)          DEFAULT '',
-    "update_time" timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "deleted"     bit         NOT NULL DEFAULT FALSE,
-    "tenant_id" bigint not null default  '0',
-    PRIMARY KEY ("id")
-) COMMENT '岗位信息表';
-
-CREATE TABLE IF NOT EXISTS `system_user_post`(
-    "id"          bigint    NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "user_id"     bigint             DEFAULT NULL,
-    "post_id"     bigint             DEFAULT NULL,
-    "creator"     varchar(64)        DEFAULT '',
-    "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updater"     varchar(64)        DEFAULT '',
-    "update_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "deleted"     bit       NOT NULL DEFAULT FALSE,
-    "tenant_id"   bigint    not null default '0',
-    PRIMARY KEY (`id`)
-) COMMENT ='用户岗位表';
-
-CREATE TABLE IF NOT EXISTS "system_notice" (
-	"id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-	"title" varchar(50) NOT NULL COMMENT '公告标题',
-	"content" text NOT NULL COMMENT '公告内容',
-	"type" tinyint NOT NULL COMMENT '公告类型（1通知 2公告）',
-	"status" tinyint NOT NULL DEFAULT '0' COMMENT '公告状态（0正常 1关闭）',
-	"creator" varchar(64) DEFAULT '' COMMENT '创建者',
-	"create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-	"updater" varchar(64) DEFAULT '' COMMENT '更新者',
-	"update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-	"deleted" bit NOT NULL DEFAULT 0 COMMENT '是否删除',
-    "tenant_id" bigint not null default  '0',
-    PRIMARY KEY("id")
-) COMMENT '通知公告表';
-
-CREATE TABLE IF NOT EXISTS `system_login_log` (
-    `id`          bigint(20)   NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    `log_type`    bigint(4)    NOT NULL,
-    "user_id" bigint not null default '0',
-    "user_type" tinyint NOT NULL,
-    `trace_id`    varchar(64)  NOT NULL DEFAULT '',
-    `username`    varchar(50)  NOT NULL DEFAULT '',
-    `result`      tinyint(4)   NOT NULL,
-    `user_ip`     varchar(50)  NOT NULL,
-    `user_agent`  varchar(512) NOT NULL,
-    `creator`   varchar(64)           DEFAULT '',
-    `create_time` datetime     NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    `updater`   varchar(64)           DEFAULT '',
-    `update_time` datetime     NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-    `deleted`     bit(1)       NOT NULL DEFAULT '0',
-    PRIMARY KEY (`id`)
-) COMMENT ='系统访问记录';
-
-CREATE TABLE IF NOT EXISTS `system_operate_log` (
-    `id`               bigint(20)    NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    `trace_id`         varchar(64)   NOT NULL DEFAULT '',
-    `user_id`          bigint(20)    NOT NULL,
-    "user_type" tinyint not null default '0',
-    `type`           varchar(50)   NOT NULL,
-    `sub_type`             varchar(50)   NOT NULL,
-    `biz_id`          bigint(20)    NOT NULL,
-    `action`          varchar(2000) NOT NULL DEFAULT '',
-    `extra`             varchar(512)  NOT NULL DEFAULT '',
-    `request_method`   varchar(16)            DEFAULT '',
-    `request_url`      varchar(255)           DEFAULT '',
-    `user_ip`          varchar(50)            DEFAULT NULL,
-    `user_agent`       varchar(200)           DEFAULT NULL,
-    `creator`        varchar(64)            DEFAULT '',
-    `create_time`      datetime      NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    `updater`        varchar(64)            DEFAULT '',
-    `update_time`      datetime      NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-    `deleted`          bit(1)        NOT NULL DEFAULT '0',
-    "tenant_id"         bigint not null default  '0',
-    PRIMARY KEY (`id`)
-) COMMENT ='操作日志记录';
-
-CREATE TABLE IF NOT EXISTS "system_users" (
-    "id" bigint not null GENERATED BY DEFAULT AS IDENTITY,
-    "username" varchar(30) not null,
-    "password" varchar(100) not null default '',
-    "nickname" varchar(30) not null,
-    "remark" varchar(500) default null,
-    "dept_id" bigint default null,
-    "post_ids" varchar(255) default null,
-    "email" varchar(50) default '',
-    "mobile" varchar(11) default '',
-    "sex" tinyint default '0',
-    "avatar" varchar(100) default '',
-    "status" tinyint not null default '0',
-    "login_ip" varchar(50) default '',
-    "login_date" timestamp default null,
-    "creator" varchar(64) default '',
-    "create_time" timestamp not null default current_timestamp,
-    "updater" varchar(64) default '',
-    "update_time" timestamp not null default current_timestamp,
-    "deleted" bit not null default false,
-    "tenant_id" bigint not null default  '0',
-    primary key ("id")
-) comment '用户信息表';
-
-CREATE TABLE IF NOT EXISTS "system_sms_channel" (
-   "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-   "signature" varchar(10) NOT NULL,
-   "code" varchar(63) NOT NULL,
-   "status" tinyint NOT NULL,
-   "remark" varchar(255) DEFAULT NULL,
-   "api_key" varchar(63) NOT NULL,
-   "api_secret" varchar(63) DEFAULT NULL,
-   "callback_url" varchar(255) DEFAULT NULL,
-   "creator" varchar(64) DEFAULT '',
-   "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-   "updater" varchar(64) DEFAULT '',
-   "update_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-   "deleted" bit NOT NULL DEFAULT FALSE,
-   PRIMARY KEY ("id")
-) COMMENT '短信渠道';
-
-CREATE TABLE IF NOT EXISTS "system_sms_template" (
-    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "type" tinyint NOT NULL,
-    "status" tinyint NOT NULL,
-    "code" varchar(63) NOT NULL,
-    "name" varchar(63) NOT NULL,
-    "content" varchar(255) NOT NULL,
-    "params" varchar(255) NOT NULL,
-    "remark" varchar(255) DEFAULT NULL,
-    "api_template_id" varchar(63) NOT NULL,
-    "channel_id" bigint NOT NULL,
-    "channel_code" varchar(63) NOT NULL,
-    "creator" varchar(64) DEFAULT '',
-    "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updater" varchar(64) DEFAULT '',
-    "update_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "deleted" bit NOT NULL DEFAULT FALSE,
-    PRIMARY KEY ("id")
-) COMMENT '短信模板';
-
-CREATE TABLE IF NOT EXISTS "system_sms_log" (
-   "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-   "channel_id" bigint NOT NULL,
-   "channel_code" varchar(63) NOT NULL,
-   "template_id" bigint NOT NULL,
-   "template_code" varchar(63) NOT NULL,
-   "template_type" tinyint NOT NULL,
-   "template_content" varchar(255) NOT NULL,
-   "template_params" varchar(255) NOT NULL,
-   "api_template_id" varchar(63) NOT NULL,
-   "mobile" varchar(11) NOT NULL,
-   "user_id" bigint DEFAULT '0',
-   "user_type" tinyint DEFAULT '0',
-   "send_status" tinyint NOT NULL DEFAULT '0',
-   "send_time" timestamp DEFAULT NULL,
-   "send_code" int DEFAULT NULL,
-   "send_msg" varchar(255) DEFAULT NULL,
-   "api_send_code" varchar(63) DEFAULT NULL,
-   "api_send_msg" varchar(255) DEFAULT NULL,
-   "api_request_id" varchar(255) DEFAULT NULL,
-   "api_serial_no" varchar(255) DEFAULT NULL,
-   "receive_status" tinyint NOT NULL DEFAULT '0',
-   "receive_time" timestamp DEFAULT NULL,
-   "api_receive_code" varchar(63) DEFAULT NULL,
-   "api_receive_msg" varchar(255) DEFAULT NULL,
-   "creator" varchar(64) DEFAULT '',
-   "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-   "updater" varchar(64) DEFAULT '',
-   "update_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-   "deleted" bit NOT NULL DEFAULT FALSE,
-   PRIMARY KEY ("id")
-) COMMENT '短信日志';
-
-CREATE TABLE IF NOT EXISTS "system_sms_code" (
-    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "mobile" varchar(11) NOT NULL,
-    "code" varchar(11) NOT NULL,
-    "scene" bigint NOT NULL,
-    "create_ip" varchar NOT NULL,
-    "today_index" int NOT NULL,
-    "used" bit NOT NULL DEFAULT FALSE,
-    "used_time" timestamp DEFAULT NULL,
-    "used_ip" varchar NULL,
-    "creator" varchar(64) DEFAULT '',
-    "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updater" varchar(64) DEFAULT '',
-    "update_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "deleted" bit NOT NULL DEFAULT FALSE,
-    PRIMARY KEY ("id")
-) COMMENT '短信日志';
-
-CREATE TABLE IF NOT EXISTS "system_social_client" (
-  "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-  "name" varchar(255) NOT NULL,
-  "social_type" int NOT NULL,
-  "user_type" int NOT NULL,
-  "client_id" varchar(255) NOT NULL,
-  "client_secret" varchar(255) NOT NULL,
-  "agent_id" varchar(255) NOT NULL,
-  "status" int NOT NULL,
-  "creator" varchar(64) DEFAULT '',
-  "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  "updater" varchar(64) DEFAULT '',
-  "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  "deleted" bit NOT NULL DEFAULT FALSE,
-  "tenant_id" bigint not null default  '0',
-  PRIMARY KEY ("id")
-) COMMENT '社交客户端表';
-
-CREATE TABLE IF NOT EXISTS "system_social_user" (
-   "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-   "type" tinyint NOT NULL,
-   "openid" varchar(64) NOT NULL,
-   "token" varchar(256) DEFAULT NULL,
-   "raw_token_info" varchar(1024) NOT NULL,
-   "nickname" varchar(32) NOT NULL,
-   "avatar" varchar(255) DEFAULT NULL,
-   "raw_user_info" varchar(1024) NOT NULL,
-   "code" varchar(64) NOT NULL,
-   "state" varchar(64),
-   "creator" varchar(64) DEFAULT '',
-   "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-   "updater" varchar(64) DEFAULT '',
-   "update_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-   "deleted" bit NOT NULL DEFAULT FALSE,
-   PRIMARY KEY ("id")
-) COMMENT '社交用户';
-
-CREATE TABLE IF NOT EXISTS "system_social_user_bind" (
-   "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-   "user_id" bigint NOT NULL,
-   "user_type" tinyint NOT NULL,
-   "social_type" tinyint NOT NULL,
-   "social_user_id" number NOT NULL,
-   "creator" varchar(64) DEFAULT '',
-   "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-   "updater" varchar(64) DEFAULT '',
-   "update_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-   "deleted" bit NOT NULL DEFAULT FALSE,
-   PRIMARY KEY ("id")
-) COMMENT '社交用户的绑定';
-
-CREATE TABLE IF NOT EXISTS "system_tenant" (
-    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "name" varchar(63) NOT NULL,
-    "contact_user_id" bigint NOT NULL DEFAULT '0',
-    "contact_name" varchar(255) NOT NULL,
-    "contact_mobile" varchar(255),
-    "status" tinyint NOT NULL,
-    "website" varchar(63) DEFAULT '',
-    "package_id"  bigint NOT NULL,
-    "expire_time" timestamp NOT NULL,
-    "account_count" int NOT NULL,
-    "creator" varchar(64) DEFAULT '',
-    "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updater" varchar(64) DEFAULT '',
-    "update_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "deleted" bit NOT NULL DEFAULT FALSE,
-    PRIMARY KEY ("id")
-) COMMENT '租户';
-
-CREATE TABLE IF NOT EXISTS "system_tenant_package" (
-    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "name" varchar(30) NOT NULL,
-    "status" tinyint NOT NULL,
-    "remark" varchar(256),
-    "menu_ids" varchar(2048) NOT NULL,
-    "creator" varchar(64) DEFAULT '',
-    "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updater" varchar(64) DEFAULT '',
-    "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-    "deleted" bit NOT NULL DEFAULT FALSE,
-    PRIMARY KEY ("id")
-) COMMENT '租户套餐表';
-
-CREATE TABLE IF NOT EXISTS "system_oauth2_client" (
-  "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-  "client_id" varchar NOT NULL,
-  "secret" varchar NOT NULL,
-  "name" varchar NOT NULL,
-  "logo" varchar NOT NULL,
-  "description" varchar,
-  "status" int NOT NULL,
-  "access_token_validity_seconds" int NOT NULL,
-  "refresh_token_validity_seconds" int NOT NULL,
-  "redirect_uris" varchar NOT NULL,
-  "authorized_grant_types" varchar NOT NULL,
-  "scopes" varchar NOT NULL DEFAULT '',
-  "auto_approve_scopes" varchar NOT NULL DEFAULT '',
-  "authorities" varchar NOT NULL DEFAULT '',
-  "resource_ids" varchar NOT NULL DEFAULT '',
-  "additional_information" varchar NOT NULL DEFAULT '',
-  "creator" varchar DEFAULT '',
-  "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  "updater" varchar DEFAULT '',
-  "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  "deleted" bit NOT NULL DEFAULT FALSE,
-  PRIMARY KEY ("id")
-) COMMENT 'OAuth2 客户端表';
-
-CREATE TABLE IF NOT EXISTS "system_oauth2_approve" (
-  "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-  "user_id" bigint NOT NULL,
-  "user_type" tinyint NOT NULL,
-  "client_id" varchar NOT NULL,
-  "scope" varchar NOT NULL,
-  "approved" bit NOT NULL DEFAULT FALSE,
-  "expires_time" datetime NOT NULL,
-  "creator" varchar DEFAULT '',
-  "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  "updater" varchar DEFAULT '',
-  "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  "deleted" bit NOT NULL DEFAULT FALSE,
-  PRIMARY KEY ("id")
-) COMMENT 'OAuth2 批准表';
-
-CREATE TABLE IF NOT EXISTS "system_oauth2_access_token" (
-   "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-   "user_id" bigint NOT NULL,
-   "user_type" tinyint NOT NULL,
-   "user_info" varchar NOT NULL,
-   "access_token" varchar NOT NULL,
-   "refresh_token" varchar NOT NULL,
-   "client_id" varchar NOT NULL,
-   "scopes" varchar NOT NULL,
-   "approved" bit NOT NULL DEFAULT FALSE,
-   "expires_time" datetime NOT NULL,
-   "creator" varchar DEFAULT '',
-   "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-   "updater" varchar DEFAULT '',
-   "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-   "deleted" bit NOT NULL DEFAULT FALSE,
-   "tenant_id" bigint NOT NULL,
-   PRIMARY KEY ("id")
-) COMMENT 'OAuth2 访问令牌';
-
-CREATE TABLE IF NOT EXISTS "system_oauth2_refresh_token" (
-    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "user_id" bigint NOT NULL,
-    "user_type" tinyint NOT NULL,
-    "refresh_token" varchar NOT NULL,
-    "client_id" varchar NOT NULL,
-    "scopes" varchar NOT NULL,
-    "approved" bit NOT NULL DEFAULT FALSE,
-    "expires_time" datetime NOT NULL,
-    "creator" varchar DEFAULT '',
-    "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updater" varchar DEFAULT '',
-    "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-    "deleted" bit NOT NULL DEFAULT FALSE,
-    PRIMARY KEY ("id")
-) COMMENT 'OAuth2 刷新令牌';
-
-CREATE TABLE IF NOT EXISTS "system_oauth2_code" (
-     "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-     "user_id" bigint NOT NULL,
-     "user_type" tinyint NOT NULL,
-     "code" varchar NOT NULL,
-     "client_id" varchar NOT NULL,
-     "scopes" varchar NOT NULL,
-     "expires_time" datetime NOT NULL,
-     "redirect_uri" varchar NOT NULL,
-     "state" varchar NOT NULL,
-     "creator" varchar DEFAULT '',
-     "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-     "updater" varchar DEFAULT '',
-     "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-     "deleted" bit NOT NULL DEFAULT FALSE,
-     PRIMARY KEY ("id")
-) COMMENT 'OAuth2 刷新令牌';
-
-CREATE TABLE IF NOT EXISTS "system_mail_account" (
-    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "mail" varchar NOT NULL,
-    "username" varchar NOT NULL,
-    "password" varchar NOT NULL,
-    "host" varchar NOT NULL,
-    "port" int NOT NULL,
-    "ssl_enable" bit NOT NULL,
-    "starttls_enable" bit NOT NULL,
-    "creator" varchar DEFAULT '',
-    "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updater" varchar DEFAULT '',
-    "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-    "deleted" bit NOT NULL DEFAULT FALSE,
-    PRIMARY KEY ("id")
-) COMMENT '邮箱账号表';
-
-CREATE TABLE IF NOT EXISTS "system_mail_template" (
-    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "name" varchar NOT NULL,
-    "code" varchar NOT NULL,
-    "account_id" bigint NOT NULL,
-    "nickname" varchar,
-    "title" varchar NOT NULL,
-    "content" varchar NOT NULL,
-    "params" varchar NOT NULL,
-    "status" varchar NOT NULL,
-    "remark" varchar,
-    "creator" varchar DEFAULT '',
-    "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updater" varchar DEFAULT '',
-    "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-    "deleted" bit NOT NULL DEFAULT FALSE,
-    PRIMARY KEY ("id")
-) COMMENT '邮件模版表';
-
-CREATE TABLE IF NOT EXISTS "system_mail_log" (
-    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "user_id" bigint,
-    "user_type" varchar,
-    "to_mail" varchar NOT NULL,
-    "account_id" bigint NOT NULL,
-    "from_mail" varchar NOT NULL,
-    "template_id" bigint NOT NULL,
-    "template_code" varchar NOT NULL,
-    "template_nickname" varchar,
-    "template_title" varchar NOT NULL,
-    "template_content" varchar NOT NULL,
-    "template_params" varchar NOT NULL,
-    "send_status" varchar NOT NULL,
-    "send_time" datetime,
-    "send_message_id" varchar,
-    "send_exception" varchar,
-    "creator" varchar DEFAULT '',
-    "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updater" varchar DEFAULT '',
-    "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-    "deleted" bit NOT NULL DEFAULT FALSE,
-    PRIMARY KEY ("id")
-) COMMENT '邮件日志表';
-
--- 将该建表 SQL 语句，添加到 hangtag-module-system-biz 模块的 test/resources/sql/create_tables.sql 文件里
-CREATE TABLE IF NOT EXISTS "system_notify_template" (
-    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "name" varchar NOT NULL,
-    "code" varchar NOT NULL,
-    "nickname" varchar NOT NULL,
-    "content" varchar NOT NULL,
-    "type" varchar NOT NULL,
-    "params" varchar,
-    "status" varchar NOT NULL,
-    "remark" varchar,
-    "creator" varchar DEFAULT '',
-    "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updater" varchar DEFAULT '',
-    "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-    "deleted" bit NOT NULL DEFAULT FALSE,
-    PRIMARY KEY ("id")
-) COMMENT '站内信模板表';
-
-CREATE TABLE IF NOT EXISTS "system_notify_message" (
-    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "user_id" bigint NOT NULL,
-    "user_type" varchar NOT NULL,
-    "template_id" bigint NOT NULL,
-    "template_code" varchar NOT NULL,
-    "template_nickname" varchar NOT NULL,
-    "template_content" varchar NOT NULL,
-    "template_type" int NOT NULL,
-    "template_params" varchar NOT NULL,
-    "read_status" bit NOT NULL,
-    "read_time" varchar,
-    "creator" varchar DEFAULT '',
-    "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updater" varchar DEFAULT '',
-    "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-    "deleted" bit NOT NULL DEFAULT FALSE,
-    "tenant_id" bigint not null default  '0',
-    PRIMARY KEY ("id")
-) COMMENT '站内信消息表';
diff --git a/hangtag-server/target/classes/application-dev.yaml b/hangtag-server/target/classes/application-dev.yaml
deleted file mode 100644
index b66f094..0000000
--- a/hangtag-server/target/classes/application-dev.yaml
+++ /dev/null
@@ -1,203 +0,0 @@
-server:
-  port: 48080
-
---- #################### 数据库相关配置 ####################
-
-spring:
-  # 数据源配置项
-  autoconfigure:
-    exclude:
-      - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置，使用 dynamic-datasource-spring-boot-starter 配置多数据源
-  datasource:
-    druid: # Druid 【监控】相关的全局配置
-      web-stat-filter:
-        enabled: true
-      stat-view-servlet:
-        enabled: true
-        allow: # 设置白名单，不填则允许所有访问
-        url-pattern: /druid/*
-        login-username: # 控制台管理用户名和密码
-        login-password:
-      filter:
-        stat:
-          enabled: true
-          log-slow-sql: true # 慢 SQL 记录
-          slow-sql-millis: 100
-          merge-sql: true
-        wall:
-          config:
-            multi-statement-allow: true
-    dynamic: # 多数据源配置
-      druid: # Druid 【连接池】相关的全局配置
-        initial-size: 5 # 初始连接数
-        min-idle: 10 # 最小连接池数量
-        max-active: 20 # 最大连接池数量
-        max-wait: 600000 # 配置获取连接等待超时的时间，单位：毫秒
-        time-between-eviction-runs-millis: 60000 # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位：毫秒
-        min-evictable-idle-time-millis: 300000 # 配置一个连接在池中最小生存的时间，单位：毫秒
-        max-evictable-idle-time-millis: 900000 # 配置一个连接在池中最大生存的时间，单位：毫秒
-        validation-query: SELECT 1 # 配置检测连接是否有效
-        test-while-idle: true
-        test-on-borrow: false
-        test-on-return: false
-      primary: master
-      datasource:
-        master:
-          url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
-          username: root
-          password: Admin11039
-#        slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改
-#          lazy: true # 开启懒加载，保证启动速度
-#          url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
-#          username: root
-#          password: 123456
-
-  # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
-  redis:
-    host: 400-infra.server.iocoder.cn # 地址
-    port: 6379 # 端口
-    database: 1 # 数据库索引
-#    password: 123456 # 密码，建议生产环境开启
-
---- #################### 定时任务相关配置 ####################
-
-# Quartz 配置项，对应 QuartzProperties 配置类
-spring:
-  quartz:
-    auto-startup: true # 测试环境，需要开启 Job
-    scheduler-name: schedulerName # Scheduler 名字。默认为 schedulerName
-    job-store-type: jdbc # Job 存储器类型。默认为 memory 表示内存，可选 jdbc 使用数据库。
-    wait-for-jobs-to-complete-on-shutdown: true # 应用关闭时，是否等待定时任务执行完成。默认为 false ，建议设置为 true
-    properties: # 添加 Quartz Scheduler 附加属性，更多可以看 http://www.quartz-scheduler.org/documentation/2.4.0-SNAPSHOT/configuration.html 文档
-      org:
-        quartz:
-          # Scheduler 相关配置
-          scheduler:
-            instanceName: schedulerName
-            instanceId: AUTO # 自动生成 instance ID
-          # JobStore 相关配置
-          jobStore:
-            # JobStore 实现类。可见博客：https://blog.csdn.net/weixin_42458219/article/details/122247162
-            class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
-            isClustered: true # 是集群模式
-            clusterCheckinInterval: 15000 # 集群检查频率，单位：毫秒。默认为 15000，即 15 秒
-            misfireThreshold: 60000 # misfire 阀值，单位：毫秒。
-          # 线程池相关配置
-          threadPool:
-            threadCount: 25 # 线程池大小。默认为 10 。
-            threadPriority: 5 # 线程优先级
-            class: org.quartz.simpl.SimpleThreadPool # 线程池类型
-    jdbc: # 使用 JDBC 的 JobStore 的时候，JDBC 的配置
-      initialize-schema: NEVER # 是否自动使用 SQL 初始化 Quartz 表结构。这里设置成 never ，我们手动创建表结构。
-
---- #################### 消息队列相关 ####################
-
-# rocketmq 配置项，对应 RocketMQProperties 配置类
-rocketmq:
-  name-server: 127.0.0.1:9876 # RocketMQ Namesrv
-
-spring:
-  # RabbitMQ 配置项，对应 RabbitProperties 配置类
-  rabbitmq:
-    host: 127.0.0.1 # RabbitMQ 服务的地址
-    port: 5672 # RabbitMQ 服务的端口
-    username: guest # RabbitMQ 服务的账号
-    password: guest # RabbitMQ 服务的密码
-  # Kafka 配置项，对应 KafkaProperties 配置类
-  kafka:
-    bootstrap-servers: 127.0.0.1:9092 # 指定 Kafka Broker 地址，可以设置多个，以逗号分隔
-
---- #################### 服务保障相关配置 ####################
-
-# Lock4j 配置项
-lock4j:
-  acquire-timeout: 3000 # 获取分布式锁超时时间，默认为 3000 毫秒
-  expire: 30000 # 分布式锁的超时时间，默认为 30 毫秒
-
---- #################### 监控相关配置 ####################
-
-# Actuator 监控端点的配置项
-management:
-  endpoints:
-    web:
-      base-path: /actuator # Actuator 提供的 API 接口的根目录。默认为 /actuator
-      exposure:
-        include: '*' # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ，可以开放所有端点。
-
-# Spring Boot Admin 配置项
-spring:
-  boot:
-    admin:
-      # Spring Boot Admin Client 客户端的相关配置
-      client:
-        url: http://127.0.0.1:${server.port}/${spring.boot.admin.context-path} # 设置 Spring Boot Admin Server 地址
-        instance:
-          service-host-type: IP # 注册实例时，优先使用 IP [IP, HOST_NAME, CANONICAL_HOST_NAME]
-      # Spring Boot Admin Server 服务端的相关配置
-      context-path: /admin # 配置 Spring
-
-# 日志文件配置
-logging:
-  file:
-    name: ${user.home}/logs/${spring.application.name}.log # 日志文件名，全路径
-
---- #################### 微信公众号相关配置 ####################
-wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档
-  mp:
-    # 公众号配置(必填)
-    app-id: wx041349c6f39b268b
-    secret: 5abee519483bc9f8cb37ce280e814bd0
-    # 存储配置，解决 AccessToken 的跨节点的共享
-    config-storage:
-      type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取
-      key-prefix: wx # Redis Key 的前缀
-      http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台
-  miniapp: # 小程序配置（必填），参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-miniapp-spring-boot-starter/README.md 文档
-    appid: wx63c280fe3248a3e7
-    secret: 6f270509224a7ae1296bbf1c8cb97aed
-    config-storage:
-      type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取
-      key-prefix: wa # Redis Key 的前缀
-      http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台
-
---- #################### 芋道相关配置 ####################
-
-# 芋道配置项，设置当前项目所有自定义的配置
-hangtag:
-  xss:
-    enable: false
-    exclude-urls: # 如下两个 url，仅仅是为了演示，去掉配置也没关系
-      - ${spring.boot.admin.context-path}/** # 不处理 Spring Boot Admin 的请求
-      - ${management.endpoints.web.base-path}/** # 不处理 Actuator 的请求
-  pay:
-    order-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/order # 支付渠道的【支付】回调地址
-    refund-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/refund # 支付渠道的【退款】回调地址
-  demo: true # 开启演示模式
-  tencent-lbs-key: TVDBZ-TDILD-4ON4B-PFDZA-RNLKH-VVF6E # QQ 地图的密钥 https://lbs.qq.com/service/staticV2/staticGuide/staticDoc
-
-justauth:
-  enabled: true
-  type:
-    DINGTALK: # 钉钉
-      client-id: dingvrnreaje3yqvzhxg
-      client-secret: i8E6iZyDvZj51JIb0tYsYfVQYOks9Cq1lgryEjFRqC79P3iJcrxEwT6Qk2QvLrLI
-      ignore-check-redirect-uri: true
-    WECHAT_ENTERPRISE: # 企业微信
-      client-id: wwd411c69a39ad2e54
-      client-secret: 1wTb7hYxnpT2TUbIeHGXGo7T0odav1ic10mLdyyATOw
-      agent-id: 1000004
-      ignore-check-redirect-uri: true
-    # noinspection SpringBootApplicationYaml
-    WECHAT_MINI_APP: # 微信小程序
-      client-id: ${wx.miniapp.appid}
-      client-secret: ${wx.miniapp.secret}
-      ignore-check-redirect-uri: true
-      ignore-check-state: true # 微信小程序，不会使用到 state，所以不进行校验
-    WECHAT_MP: # 微信公众号
-      client-id: ${wx.mp.app-id}
-      client-secret: ${wx.mp.secret}
-      ignore-check-redirect-uri: true
-  cache:
-    type: REDIS
-    prefix: 'social_auth_state:' # 缓存前缀，目前只对 Redis 缓存生效，默认 JUSTAUTH::STATE::
-    timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟
\ No newline at end of file
diff --git a/hangtag-server/target/classes/application-local.yaml b/hangtag-server/target/classes/application-local.yaml
deleted file mode 100644
index 32239c3..0000000
--- a/hangtag-server/target/classes/application-local.yaml
+++ /dev/null
@@ -1,242 +0,0 @@
-server:
-  port: 48080
-
---- #################### 数据库相关配置 ####################
-
-spring:
-  # 数据源配置项
-  autoconfigure:
-    exclude:
-      - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置，使用 dynamic-datasource-spring-boot-starter 配置多数据源
-      - org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration # 默认 local 环境，不开启 Quartz 的自动配置
-      - de.codecentric.boot.admin.server.config.AdminServerAutoConfiguration # 禁用 Spring Boot Admin 的 Server 的自动配置
-      - de.codecentric.boot.admin.server.ui.config.AdminServerUiAutoConfiguration # 禁用 Spring Boot Admin 的 Server UI 的自动配置
-      - de.codecentric.boot.admin.client.config.SpringBootAdminClientAutoConfiguration # 禁用 Spring Boot Admin 的 Client 的自动配置
-  datasource:
-    druid: # Druid 【监控】相关的全局配置
-      web-stat-filter:
-        enabled: true
-      stat-view-servlet:
-        enabled: true
-        allow: # 设置白名单，不填则允许所有访问
-        url-pattern: /druid/*
-        login-username: # 控制台管理用户名和密码
-        login-password:
-      filter:
-        stat:
-          enabled: true
-          log-slow-sql: true # 慢 SQL 记录
-          slow-sql-millis: 100
-          merge-sql: true
-        wall:
-          config:
-            multi-statement-allow: true
-    dynamic: # 多数据源配置
-      druid: # Druid 【连接池】相关的全局配置
-        initial-size: 1 # 初始连接数
-        min-idle: 1 # 最小连接池数量
-        max-active: 20 # 最大连接池数量
-        max-wait: 600000 # 配置获取连接等待超时的时间，单位：毫秒
-        time-between-eviction-runs-millis: 60000 # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位：毫秒
-        min-evictable-idle-time-millis: 300000 # 配置一个连接在池中最小生存的时间，单位：毫秒
-        max-evictable-idle-time-millis: 900000 # 配置一个连接在池中最大生存的时间，单位：毫秒
-        validation-query: SELECT 1 FROM DUAL # 配置检测连接是否有效
-        test-while-idle: true
-        test-on-borrow: false
-        test-on-return: false
-      primary: master
-      datasource:
-        master:
-          url: jdbc:mysql://127.0.0.1:3306/hangtag?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
-          username: root
-          password: 123456
-#        slave: # 模拟从库，可根据自己需要修改
-#          lazy: true # 开启懒加载，保证启动速度
-#          url: jdbc:mysql://43.136.71.164:3306/hangtag?allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&useUnicode=true&characterEncoding=UTF-8
-#          username: test
-#          password: test@123
-
-  # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
-  redis:
-    host: 127.0.0.1 # 地址
-    port: 6379 # 端口
-    database: 0 # 数据库索引
-#    password: dev # 密码，建议生产环境开启
-
---- #################### 定时任务相关配置 ####################
-
-# Quartz 配置项，对应 QuartzProperties 配置类
-spring:
-  quartz:
-    auto-startup: true # 本地开发环境，尽量不要开启 Job
-    scheduler-name: schedulerName # Scheduler 名字。默认为 schedulerName
-    job-store-type: jdbc # Job 存储器类型。默认为 memory 表示内存，可选 jdbc 使用数据库。
-    wait-for-jobs-to-complete-on-shutdown: true # 应用关闭时，是否等待定时任务执行完成。默认为 false ，建议设置为 true
-    properties: # 添加 Quartz Scheduler 附加属性，更多可以看 http://www.quartz-scheduler.org/documentation/2.4.0-SNAPSHOT/configuration.html 文档
-      org:
-        quartz:
-          # Scheduler 相关配置
-          scheduler:
-            instanceName: schedulerName
-            instanceId: AUTO # 自动生成 instance ID
-          # JobStore 相关配置
-          jobStore:
-            # JobStore 实现类。可见博客：https://blog.csdn.net/weixin_42458219/article/details/122247162
-            class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
-            isClustered: true # 是集群模式
-            clusterCheckinInterval: 15000 # 集群检查频率，单位：毫秒。默认为 15000，即 15 秒
-            misfireThreshold: 60000 # misfire 阀值，单位：毫秒。
-          # 线程池相关配置
-          threadPool:
-            threadCount: 25 # 线程池大小。默认为 10 。
-            threadPriority: 5 # 线程优先级
-            class: org.quartz.simpl.SimpleThreadPool # 线程池类型
-    jdbc: # 使用 JDBC 的 JobStore 的时候，JDBC 的配置
-      initialize-schema: NEVER # 是否自动使用 SQL 初始化 Quartz 表结构。这里设置成 never ，我们手动创建表结构。
-
---- #################### 消息队列相关 ####################
-
-# rocketmq 配置项，对应 RocketMQProperties 配置类
-rocketmq:
-  name-server: 127.0.0.1:9876 # RocketMQ Namesrv
-
-spring:
-  # RabbitMQ 配置项，对应 RabbitProperties 配置类
-  rabbitmq:
-    host: 127.0.0.1 # RabbitMQ 服务的地址
-    port: 5672 # RabbitMQ 服务的端口
-    username: rabbit # RabbitMQ 服务的账号
-    password: rabbit # RabbitMQ 服务的密码
-  # Kafka 配置项，对应 KafkaProperties 配置类
-  kafka:
-    bootstrap-servers: 127.0.0.1:9092 # 指定 Kafka Broker 地址，可以设置多个，以逗号分隔
-
---- #################### 服务保障相关配置 ####################
-
-# Lock4j 配置项
-lock4j:
-  acquire-timeout: 3000 # 获取分布式锁超时时间，默认为 3000 毫秒
-  expire: 30000 # 分布式锁的超时时间，默认为 30 毫秒
-
---- #################### 监控相关配置 ####################
-
-# Actuator 监控端点的配置项
-management:
-  endpoints:
-    web:
-      base-path: /actuator # Actuator 提供的 API 接口的根目录。默认为 /actuator
-      exposure:
-        include: '*' # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ，可以开放所有端点。
-
-# Spring Boot Admin 配置项
-spring:
-  boot:
-    admin:
-      # Spring Boot Admin Client 客户端的相关配置
-      client:
-        url: http://127.0.0.1:${server.port}/${spring.boot.admin.context-path} # 设置 Spring Boot Admin Server 地址
-        instance:
-          service-host-type: IP # 注册实例时，优先使用 IP [IP, HOST_NAME, CANONICAL_HOST_NAME]
-      # Spring Boot Admin Server 服务端的相关配置
-      context-path: /admin # 配置 Spring
-
-# 日志文件配置
-logging:
-  file:
-    name: ${user.home}/logs/${spring.application.name}.log # 日志文件名，全路径
-  level:
-    # 配置自己写的 MyBatis Mapper 打印日志
-    cn.hangtag.module.bpm.dal.mysql: debug
-    cn.hangtag.module.infra.dal.mysql: debug
-    cn.hangtag.module.infra.dal.mysql.logger.ApiErrorLogMapper: INFO # 配置 ApiErrorLogMapper 的日志级别为 info，避免和 GlobalExceptionHandler 重复打印
-    cn.hangtag.module.infra.dal.mysql.job.JobLogMapper: INFO # 配置 JobLogMapper 的日志级别为 info
-    cn.hangtag.module.infra.dal.mysql.file.FileConfigMapper: INFO # 配置 FileConfigMapper 的日志级别为 info
-    cn.hangtag.module.pay.dal.mysql: debug
-    cn.hangtag.module.pay.dal.mysql.notify.PayNotifyTaskMapper: INFO # 配置 PayNotifyTaskMapper 的日志级别为 info
-    cn.hangtag.module.system.dal.mysql: debug
-    cn.hangtag.module.system.dal.mysql.sms.SmsChannelMapper: INFO # 配置 SmsChannelMapper 的日志级别为 info
-    cn.hangtag.module.tool.dal.mysql: debug
-    cn.hangtag.module.member.dal.mysql: debug
-    cn.hangtag.module.trade.dal.mysql: debug
-    cn.hangtag.module.promotion.dal.mysql: debug
-    cn.hangtag.module.statistics.dal.mysql: debug
-    cn.hangtag.module.crm.dal.mysql: debug
-    cn.hangtag.module.erp.dal.mysql: debug
-    org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR # TODO 芋艿：先禁用，Spring Boot 3.X 存在部分错误的 WARN 提示
-
-debug: false
-
---- #################### 微信公众号、小程序相关配置 ####################
-wx:
-  mp: # 公众号配置（必填），参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档
-#    app-id: wx041349c6f39b268b # 测试号（牛希尧提供的）
-#    secret: 5abee519483bc9f8cb37ce280e814bd0
-    app-id: wx5b23ba7a5589ecbb # 测试号（自己的）
-    secret: 2a7b3b20c537e52e74afd395eb85f61f
-#    app-id: wxa69ab825b163be19 # 测试号（Kongdy 提供的）
-#    secret: bd4f9fab889591b62aeac0d7b8d8b4a0
-    # 存储配置，解决 AccessToken 的跨节点的共享
-    config-storage:
-      type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取
-      key-prefix: wx # Redis Key 的前缀
-      http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台
-  miniapp: # 小程序配置（必填），参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-miniapp-spring-boot-starter/README.md 文档
-    #    appid: wx62056c0d5e8db250 # 测试号（牛希尧提供的）
-    #    secret: 333ae72f41552af1e998fe1f54e1584a
-    appid: wx63c280fe3248a3e7 # wenhualian的接口测试号
-    secret: 6f270509224a7ae1296bbf1c8cb97aed
-#    appid: wxc4598c446f8a9cb3 # 测试号（Kongdy 提供的）
-#    secret: 4a1a04e07f6a4a0751b39c3064a92c8b
-    config-storage:
-      type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取
-      key-prefix: wa # Redis Key 的前缀
-      http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台
-
---- #################### 芋道相关配置 ####################
-
-# 芋道配置项，设置当前项目所有自定义的配置
-hangtag:
-  captcha:
-    enable: false # 本地环境，暂时关闭图片验证码，方便登录等接口的测试；
-  security:
-    mock-enable: true
-  xss:
-    enable: false
-    exclude-urls: # 如下两个 url，仅仅是为了演示，去掉配置也没关系
-      - ${spring.boot.admin.context-path}/** # 不处理 Spring Boot Admin 的请求
-      - ${management.endpoints.web.base-path}/** # 不处理 Actuator 的请求
-  pay:
-    order-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/order # 支付渠道的【支付】回调地址
-    refund-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/refund # 支付渠道的【退款】回调地址
-  access-log: # 访问日志的配置项
-    enable: false
-  demo: false # 关闭演示模式
-  tencent-lbs-key: TVDBZ-TDILD-4ON4B-PFDZA-RNLKH-VVF6E # QQ 地图的密钥 https://lbs.qq.com/service/staticV2/staticGuide/staticDoc
-
-justauth:
-  enabled: true
-  type:
-    DINGTALK: # 钉钉
-      client-id: dingvrnreaje3yqvzhxg
-      client-secret: i8E6iZyDvZj51JIb0tYsYfVQYOks9Cq1lgryEjFRqC79P3iJcrxEwT6Qk2QvLrLI
-      ignore-check-redirect-uri: true
-    WECHAT_ENTERPRISE: # 企业微信
-      client-id: wwd411c69a39ad2e54
-      client-secret: 1wTb7hYxnpT2TUbIeHGXGo7T0odav1ic10mLdyyATOw
-      agent-id: 1000004
-      ignore-check-redirect-uri: true
-    # noinspection SpringBootApplicationYaml
-    WECHAT_MINI_APP: # 微信小程序
-      client-id: ${wx.miniapp.appid}
-      client-secret: ${wx.miniapp.secret}
-      ignore-check-redirect-uri: true
-      ignore-check-state: true # 微信小程序，不会使用到 state，所以不进行校验
-    WECHAT_MP: # 微信公众号
-      client-id: ${wx.mp.app-id}
-      client-secret: ${wx.mp.secret}
-      ignore-check-redirect-uri: true
-  cache:
-    type: REDIS
-    prefix: 'social_auth_state:' # 缓存前缀，目前只对 Redis 缓存生效，默认 JUSTAUTH::STATE::
-    timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟
-
diff --git a/hangtag-server/target/classes/application.yaml b/hangtag-server/target/classes/application.yaml
deleted file mode 100644
index e6ddef5..0000000
--- a/hangtag-server/target/classes/application.yaml
+++ /dev/null
@@ -1,276 +0,0 @@
-
-# 本地文件上传配置
-#localupload:
-#  port: 18080
-#  domain: http://127.0.0.1
-
-spring:
-  application:
-    name: hangtag-server
-
-  profiles:
-    active: local
-
-  main:
-    allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。
-
-  # Servlet 配置
-  servlet:
-    # 文件上传相关配置项
-    multipart:
-      max-file-size: 16MB # 单个文件大小
-      max-request-size: 32MB # 设置总上传的文件大小
-  mvc:
-    pathmatch:
-      matching-strategy: ANT_PATH_MATCHER # 解决 SpringFox 与 SpringBoot 2.6.x 不兼容的问题，参见 SpringFoxHandlerProviderBeanPostProcessor 类
-#    throw-exception-if-no-handler-found: true # 404 错误时抛出异常，方便统一处理
-#    static-path-pattern: /static/** # 静态资源路径; 注意：如果不配置，则 throw-exception-if-no-handler-found 不生效！！！ TODO 芋艿：不能配置，会导致 swagger 不生效
-
-  # Jackson 配置项
-  jackson:
-    serialization:
-      write-dates-as-timestamps: true # 设置 Date 的格式，使用时间戳
-      write-date-timestamps-as-nanoseconds: false # 设置不使用 nanoseconds 的格式。例如说 1611460870.401，而是直接 1611460870401
-      write-durations-as-timestamps: true # 设置 Duration 的格式，使用时间戳
-      fail-on-empty-beans: false # 允许序列化无属性的 Bean
-
-  # Cache 配置项
-  cache:
-    type: REDIS
-    redis:
-      time-to-live: 1h # 设置过期时间为 1 小时
-
-  thymeleaf:
-    prefix: classpath:/templates/
-    suffix: .html
-    mode: HTML
-    encoding: UTF-8
-    cache: false
---- #################### 接口文档配置 ####################
-
-springdoc:
-  api-docs:
-    enabled: true
-    path: /v3/api-docs
-  swagger-ui:
-    enabled: true
-    path: /swagger-ui
-  default-flat-param-object: true # 参见 https://doc.xiaominfo.com/docs/faq/v4/knife4j-parameterobject-flat-param 文档
-
-knife4j:
-  enable: true
-  setting:
-    language: zh_cn
-
-# 工作流 Flowable 配置
-flowable:
-  # 1. false: 默认值，Flowable 启动时，对比数据库表中保存的版本，如果不匹配。将抛出异常
-  # 2. true: 启动时会对数据库中所有表进行更新操作，如果表存在，不做处理，反之，自动创建表
-  # 3. create_drop: 启动时自动创建表，关闭时自动删除表
-  # 4. drop_create: 启动时，删除旧表，再创建新表
-  database-schema-update: true # 设置为 false，可通过 https://github.com/flowable/flowable-sql 初始化
-  db-history-used: true # flowable6 默认 true 生成信息表，无需手动设置
-  check-process-definitions: false # 设置为 false，禁用 /resources/processes 自动部署 BPMN XML 流程
-  history-level: audit # full：保存历史数据的最高级别，可保存全部流程相关细节，包括流程流转各节点参数
-
-# MyBatis Plus 的配置项
-mybatis-plus:
-  configuration:
-    map-underscore-to-camel-case: true # 虽然默认为 true ，但是还是显示去指定下。
-  global-config:
-    db-config:
-      id-type: NONE # “智能”模式，基于 IdTypeEnvironmentPostProcessor + 数据源的类型，自动适配成 AUTO、INPUT 模式。
-#      id-type: AUTO # 自增 ID，适合 MySQL 等直接自增的数据库
-#      id-type: INPUT # 用户输入 ID，适合 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库
-#      id-type: ASSIGN_ID # 分配 ID，默认使用雪花算法。注意，Oracle、PostgreSQL、Kingbase、DB2、H2 数据库时，需要去除实体类上的 @KeySequence 注解
-#      logic-delete-value: 1 # 逻辑已删除值(默认为 1)
-#      logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
-    banner: false # 关闭控制台的 Banner 打印
-  type-aliases-package: ${hangtag.info.base-package}.module.*.dal.dataobject
-  encryptor:
-    password: xwlVOxFax2o+OOVQksI7Ie9A # 加解密的秘钥，可使用 https://www.imaegoo.com/2020/aes-key-generator/ 网站生成
-
-mybatis-plus-join:
-  banner: false # 是否打印 mybatis plus join banner，默认true
-  sub-table-logic: true # 全局启用副表逻辑删除，默认true。关闭后关联查询不会加副表逻辑删除
-  ms-cache: true # 拦截器MappedStatement缓存，默认 true
-  table-alias: t # 表别名(默认 t)
-  logic-del-type: on # 副表逻辑删除条件的位置，支持 WHERE、ON，默认 ON
-
-# Spring Data Redis 配置
-spring:
-  data:
-    redis:
-      repositories:
-        enabled: false # 项目未使用到 Spring Data Redis 的 Repository，所以直接禁用，保证启动速度
-
-# VO 转换（数据翻译）相关
-easy-trans:
-  is-enable-global: true # 启用全局翻译（拦截所有 SpringMVC ResponseBody 进行自动翻译 )。如果对于性能要求很高可关闭此配置，或通过 @IgnoreTrans 忽略某个接口
-  is-enable-cloud: false # 禁用 TransType.RPC 微服务模式
-
---- #################### 验证码相关配置 ####################
-
-aj:
-  captcha:
-    jigsaw: classpath:images/jigsaw # 滑动验证，底图路径，不配置将使用默认图片；以 classpath: 开头，取 resource 目录下路径
-    pic-click: classpath:images/pic-click # 滑动验证，底图路径，不配置将使用默认图片；以 classpath: 开头，取 resource 目录下路径
-    cache-type: redis # 缓存 local/redis...
-    cache-number: 1000 # local 缓存的阈值,达到这个值，清除缓存
-    timing-clear: 180 # local定时清除过期缓存(单位秒),设置为0代表不执行
-    type: blockPuzzle # 验证码类型 default两种都实例化。 blockPuzzle 滑块拼图 clickWord 文字点选
-    water-mark: 芋道源码 # 右下角水印文字(我的水印)，可使用 https://tool.chinaz.com/tools/unicode.aspx 中文转 Unicode，Linux 可能需要转 unicode
-    interference-options: 0 # 滑动干扰项(0/1/2)
-    req-frequency-limit-enable: false # 接口请求次数一分钟限制是否开启 true|false
-    req-get-lock-limit: 5 # 验证失败 5 次，get接口锁定
-    req-get-lock-seconds: 10 # 验证失败后，锁定时间间隔
-    req-get-minute-limit: 30 # get 接口一分钟内请求数限制
-    req-check-minute-limit: 60 # check 接口一分钟内请求数限制
-    req-verify-minute-limit: 60 # verify 接口一分钟内请求数限制
-
---- #################### 消息队列相关 ####################
-
-# rocketmq 配置项，对应 RocketMQProperties 配置类
-rocketmq:
-  # Producer 配置项
-  producer:
-    group: ${spring.application.name}_PRODUCER # 生产者分组
-
-spring:
-  # Kafka 配置项，对应 KafkaProperties 配置类
-  kafka:
-    # Kafka Producer 配置项
-    producer:
-      acks: 1 # 0-不应答。1-leader 应答。all-所有 leader 和 follower 应答。
-      retries: 3 # 发送失败时，重试发送的次数
-      value-serializer: org.springframework.kafka.support.serializer.JsonSerializer # 消息的 value 的序列化
-    # Kafka Consumer 配置项
-    consumer:
-      auto-offset-reset: earliest # 设置消费者分组最初的消费进度为 earliest 。可参考博客 https://blog.csdn.net/lishuangzhe7047/article/details/74530417 理解
-      value-deserializer: org.springframework.kafka.support.serializer.JsonDeserializer
-      properties:
-        spring.json.trusted.packages: '*'
-    # Kafka Consumer Listener 监听器配置
-    listener:
-      missing-topics-fatal: false # 消费监听接口监听的主题不存在时，默认会报错。所以通过设置为 false ，解决报错
-
---- #################### 芋道相关配置 ####################
-
-hangtag:
-  info:
-    version: 1.0.0
-    base-package: cn.hangtag
-  web:
-    admin-ui:
-      url: http://dashboard.hangtag.iocoder.cn # Admin 管理后台 UI 的地址
-  security:
-    permit-all_urls:
-      - /admin-api/mp/open/** # 微信公众号开放平台，微信回调接口，不需要登录
-  websocket:
-    enable: true # websocket的开关
-    path: /infra/ws # 路径
-    sender-type: local # 消息发送的类型，可选值为 local、redis、rocketmq、kafka、rabbitmq
-    sender-rocketmq:
-      topic: ${spring.application.name}-websocket # 消息发送的 RocketMQ Topic
-      consumer-group: ${spring.application.name}-websocket-consumer # 消息发送的 RocketMQ Consumer Group
-    sender-rabbitmq:
-      exchange: ${spring.application.name}-websocket-exchange # 消息发送的 RabbitMQ Exchange
-      queue: ${spring.application.name}-websocket-queue # 消息发送的 RabbitMQ Queue
-    sender-kafka:
-      topic: ${spring.application.name}-websocket # 消息发送的 Kafka Topic
-      consumer-group: ${spring.application.name}-websocket-consumer # 消息发送的 Kafka Consumer Group
-  swagger:
-    title: 芋道快速开发平台
-    description: 提供管理后台、用户 App 的所有功能
-    version: ${hangtag.info.version}
-    url: ${hangtag.web.admin-ui.url}
-    email: xingyu4j@vip.qq.com
-    license: MIT
-    license-url: https://gitee.com/zhijiantianya/ruoyi-vue-pro/blob/master/LICENSE
-  captcha:
-    enable: true # 验证码的开关，默认为 true
-  codegen:
-    base-package: ${hangtag.info.base-package}
-    db-schemas: ${spring.datasource.dynamic.datasource.master.name}
-    front-type: 10 # 前端模版的类型，参见 CodegenFrontTypeEnum 枚举类
-  tenant: # 多租户相关配置项
-    enable: true
-    ignore-urls:
-      - /admin-api/system/tenant/get-id-by-name # 基于名字获取租户，不许带租户编号
-      - /admin-api/system/tenant/get-by-website # 基于域名获取租户，不许带租户编号
-      - /admin-api/system/captcha/get # 获取图片验证码，和租户无关
-      - /admin-api/system/captcha/check # 校验图片验证码，和租户无关
-      - /admin-api/infra/file/*/get/** # 获取图片，和租户无关
-      - /admin-api/system/sms/callback/* # 短信回调接口，无法带上租户编号
-      - /admin-api/pay/notify/** # 支付回调通知，不携带租户编号
-      - /jmreport/* # 积木报表，无法携带租户编号
-      - /admin-api/mp/open/** # 微信公众号开放平台，微信回调接口，无法携带租户编号
-    ignore-tables:
-      - system_tenant
-      - system_tenant_package
-      - system_dict_data
-      - system_dict_type
-      - system_error_code
-      - system_menu
-      - system_sms_channel
-      - system_sms_template
-      - system_sms_log
-      - system_sensitive_word
-      - system_oauth2_client
-      - system_mail_account
-      - system_mail_template
-      - system_mail_log
-      - system_notify_template
-      - infra_codegen_column
-      - infra_codegen_table
-      - infra_config
-      - infra_file_config
-      - infra_file
-      - infra_file_content
-      - infra_job
-      - infra_job_log
-      - infra_job_log
-      - infra_data_source_config
-      - jimu_dict
-      - jimu_dict_item
-      - jimu_report
-      - jimu_report_data_source
-      - jimu_report_db
-      - jimu_report_db_field
-      - jimu_report_db_param
-      - jimu_report_link
-      - jimu_report_map
-      - jimu_report_share
-      - rep_demo_dxtj
-      - rep_demo_employee
-      - rep_demo_gongsi
-      - rep_demo_jianpiao
-      - tmp_report_data_1
-      - tmp_report_data_income
-  sms-code: # 短信验证码相关的配置项
-    expire-times: 10m
-    send-frequency: 1m
-    send-maximum-quantity-per-day: 10
-    begin-code: 9999 # 这里配置 9999 的原因是，测试方便。
-    end-code: 9999 # 这里配置 9999 的原因是，测试方便。
-  trade:
-    order:
-      app-id: 1 # 商户编号
-      pay-expire-time: 2h # 支付的过期时间
-      receive-expire-time: 14d # 收货的过期时间
-      comment-expire-time: 7d # 评论的过期时间
-    express:
-      client: kd_niao
-      kd-niao:
-        api-key: cb022f1e-48f1-4c4a-a723-9001ac9676b8
-        business-id: 1809751
-      kd100:
-        key: pLXUGAwK5305
-        customer: E77DF18BE109F454A5CD319E44BF5177
-
-debug: false
-
-# 积木报表配置
-jeecg:
-  jmreport:
-    saas-mode: tenant
\ No newline at end of file
diff --git a/hangtag-server/target/classes/logback-spring.xml b/hangtag-server/target/classes/logback-spring.xml
deleted file mode 100644
index 57266ac..0000000
--- a/hangtag-server/target/classes/logback-spring.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<configuration>
-    <!-- 引用 Spring Boot 的 logback 基础配置 -->
-    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
-    <!-- 变量 hangtag.info.base-package，基础业务包 -->
-    <springProperty scope="context" name="hangtag.info.base-package" source="hangtag.info.base-package"/>
-    <!-- 格式化输出：%d 表示日期，%X{tid} SkWalking 链路追踪编号，%thread 表示线程名，%-5level：级别从左显示 5 个字符宽度，%msg：日志消息，%n是换行符 -->
-    <property name="PATTERN_DEFAULT" value="%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} | %highlight(${LOG_LEVEL_PATTERN:-%5p} ${PID:- }) | %boldYellow(%thread [%tid]) %boldGreen(%-40.40logger{39}) | %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/>
-
-    <!-- 控制台 Appender -->
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">　　　　　
-        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
-                <pattern>${PATTERN_DEFAULT}</pattern>
-            </layout>
-        </encoder>
-    </appender>
-
-    <!-- 文件 Appender -->
-    <!-- 参考 Spring Boot 的 file-appender.xml 编写 -->
-    <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
-                <pattern>${PATTERN_DEFAULT}</pattern>
-            </layout>
-        </encoder>
-        <!-- 日志文件名 -->
-        <file>${LOG_FILE}</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- 滚动后的日志文件名 -->
-            <fileNamePattern>${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz}</fileNamePattern>
-            <!-- 启动服务时，是否清理历史日志，一般不建议清理 -->
-            <cleanHistoryOnStart>${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false}</cleanHistoryOnStart>
-            <!-- 日志文件，到达多少容量，进行滚动 -->
-            <maxFileSize>${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB}</maxFileSize>
-            <!-- 日志文件的总大小，0 表示不限制 -->
-            <totalSizeCap>${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0}</totalSizeCap>
-            <!-- 日志文件的保留天数 -->
-            <maxHistory>${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30}</maxHistory>
-        </rollingPolicy>
-    </appender>
-    <!-- 异步写入日志，提升性能 -->
-    <appender name="ASYNC" class="ch.qos.logback.classic.AsyncAppender">
-        <!-- 不丢失日志。默认的，如果队列的 80% 已满,则会丢弃 TRACT、DEBUG、INFO 级别的日志 -->
-        <discardingThreshold>0</discardingThreshold>
-        <!-- 更改默认的队列的深度，该值会影响性能。默认值为 256 -->
-        <queueSize>256</queueSize>
-        <appender-ref ref="FILE"/>
-    </appender>
-
-    <!-- SkyWalking GRPC 日志收集，实现日志中心。注意：SkyWalking 8.4.0 版本开始支持 -->
-    <appender name="GRPC" class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.log.GRPCLogClientAppender">
-        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
-                <pattern>${PATTERN_DEFAULT}</pattern>
-            </layout>
-        </encoder>
-    </appender>
-
-    <!-- 本地环境 -->
-    <springProfile name="local">
-        <root level="INFO">
-            <appender-ref ref="STDOUT"/>
-            <appender-ref ref="GRPC"/> <!-- 本地环境下，如果不想接入 SkyWalking 日志服务，可以注释掉本行 -->
-            <appender-ref ref="ASYNC"/>  <!-- 本地环境下，如果不想打印日志，可以注释掉本行 -->
-        </root>
-    </springProfile>
-    <!-- 其它环境 -->
-    <springProfile name="dev,test,stage,prod,default">
-        <root level="INFO">
-            <appender-ref ref="STDOUT"/>
-            <appender-ref ref="ASYNC"/>
-            <appender-ref ref="GRPC"/>
-        </root>
-    </springProfile>
-
-</configuration>
diff --git a/hangtag-ui/hangtag-ui-admin/src/api/oms/saleorder/index.ts b/hangtag-ui/hangtag-ui-admin/src/api/oms/saleorder/index.ts
index 2ca4d49..9ee7a45 100644
--- a/hangtag-ui/hangtag-ui-admin/src/api/oms/saleorder/index.ts
+++ b/hangtag-ui/hangtag-ui-admin/src/api/oms/saleorder/index.ts
@@ -2,6 +2,7 @@ import request from '@/config/axios'
 
 // 销售订单 VO
 export interface SaleOrderVO {
+  id: number // 客户id
   customerId: number // 客户id
   bizdate: Date // 业务日期
   remark: string // 备注
@@ -89,6 +90,19 @@ export const SaleOrderApi = {
     })
   },
 
+  // 修改订单地址
+  updateOrderAddress: async (data: any) => {
+    return await request.put({ url: `/oms/sale-order/update-address`, data })
+  },
 
+  // 订单备注
+  updateOrderRemark: async (data: any) => {
+    return await request.put({ url: `/oms/sale-order/update-remark`, data })
+  },
+
+  // 更新分录数据
+  updateOrderEntrys: async (data: SaleOrderVO) => {
+    return await request.put({ url: `/oms/sale-order/update-entrys`, data })
+  }
 
 }
diff --git a/hangtag-ui/hangtag-ui-admin/src/api/oms/statistics/common.ts b/hangtag-ui/hangtag-ui-admin/src/api/oms/statistics/common.ts
index 3d96439..753e34d 100644
--- a/hangtag-ui/hangtag-ui-admin/src/api/oms/statistics/common.ts
+++ b/hangtag-ui/hangtag-ui-admin/src/api/oms/statistics/common.ts
@@ -2,4 +2,6 @@
 export interface DataComparisonRespVO<T> {
   value: T
   reference: T
+  value2: T
+  reference2: T
 }
diff --git a/hangtag-ui/hangtag-ui-admin/src/api/oms/statistics/trade.ts b/hangtag-ui/hangtag-ui-admin/src/api/oms/statistics/trade.ts
index 7780e77..1f882f1 100644
--- a/hangtag-ui/hangtag-ui-admin/src/api/oms/statistics/trade.ts
+++ b/hangtag-ui/hangtag-ui-admin/src/api/oms/statistics/trade.ts
@@ -16,36 +16,24 @@ export interface TradeTrendReqVO {
   times: [dayjs.ConfigType, dayjs.ConfigType]
 }
 
-/** 交易状况统计 Response VO */
-export interface TradeTrendSummaryRespVO {
-  time: string
-  turnoverPrice: number
-  orderPayPrice: number
-  rechargePrice: number
-  expensePrice: number
-  walletPayPrice: number
-  brokerageSettlementPrice: number
-  afterSaleRefundPrice: number
-}
-
 /** 交易订单数量 Response VO */
 export interface TradeOrderCountRespVO {
-  /** 待发货 */
-  undelivered?: number
-  /** 待核销 */
-  pickUp?: number
-  /** 退款中 */
-  afterSaleApply?: number
-  /** 提现待审核 */
-  auditingWithdraw?: number
+  /** 驳回 */
+  orderCountAA?: number
+  /** 待提交 */
+  orderCountA?: number
+  /** 提交中 */
+  orderCountB?: number
+  /** 已审核 */
+  orderCountC?: number
 }
 
 /** 交易订单统计 Response VO */
 export interface TradeOrderSummaryRespVO {
   /** 支付订单商品数 */
-  orderPayCount?: number
+  orderCount?: number
   /** 总支付金额，单位：分 */
-  orderPayPrice?: number
+  orderAmount?: number
 }
 
 /** 订单量趋势统计 Response VO */
@@ -53,30 +41,24 @@ export interface TradeOrderTrendRespVO {
   /** 日期 */
   date: string
   /** 订单数量 */
-  orderPayCount: number
+  orderCount: number
   /** 订单支付金额 */
-  orderPayPrice: number
+  orderAmount: number
 }
 
 // 查询交易统计
 export const getTradeStatisticsSummary = () => {
   return request.get<DataComparisonRespVO<TradeSummaryRespVO>>({
-    url: '/statistics/trade/summary'
+    url: '/oms/statistics/trade/summary'
   })
 }
 
-// 获得交易状况统计
-export const getTradeStatisticsAnalyse = (params: TradeTrendReqVO) => {
-  return request.get<DataComparisonRespVO<TradeTrendSummaryRespVO>>({
-    url: '/statistics/trade/analyse',
-    params: formatDateParam(params)
-  })
-}
+
 
 // 获得交易状况明细
 export const getTradeStatisticsList = (params: TradeTrendReqVO) => {
   return request.get<TradeTrendSummaryRespVO[]>({
-    url: '/statistics/trade/list',
+    url: '/oms/statistics/trade/list',
     params: formatDateParam(params)
   })
 }
@@ -84,14 +66,14 @@ export const getTradeStatisticsList = (params: TradeTrendReqVO) => {
 // 导出交易状况明细
 export const exportTradeStatisticsExcel = (params: TradeTrendReqVO) => {
   return request.download({
-    url: '/statistics/trade/export-excel',
+    url: '/oms/statistics/trade/export-excel',
     params: formatDateParam(params)
   })
 }
 
 // 获得交易订单数量
 export const getOrderCount = async () => {
-  return await request.get<TradeOrderCountRespVO>({ url: `/statistics/trade/order-count` })
+  return await request.get<TradeOrderCountRespVO>({ url: `/oms/statistics/trade/order-count` })
 }
 
 // 获得交易订单数量对照
@@ -108,7 +90,7 @@ export const getOrderCountTrendComparison = (
   endTime: dayjs.ConfigType
 ) => {
   return request.get<DataComparisonRespVO<TradeOrderTrendRespVO>[]>({
-    url: '/statistics/trade/order-count-trend',
+    url: '/oms/statistics/trade/order-count-trend',
     params: { type, beginTime: formatDate(beginTime), endTime: formatDate(endTime) }
   })
 }
diff --git a/hangtag-ui/hangtag-ui-admin/src/router/modules/remaining.ts b/hangtag-ui/hangtag-ui-admin/src/router/modules/remaining.ts
index 6e5ed43..cce126a 100644
--- a/hangtag-ui/hangtag-ui-admin/src/router/modules/remaining.ts
+++ b/hangtag-ui/hangtag-ui-admin/src/router/modules/remaining.ts
@@ -237,11 +237,21 @@ const remainingRouter: AppRouteRecordRaw[] = [
   {
     path: '/oms/produceorder', // 订单管理
     component: Layout,
-    name: 'ProduceOrderCenter',
+    name: 'OrderCenter',
     meta: {
       hidden: true
     },
     children: [
+      {
+        path: 'order/detail/:id(\\d+)',
+        component: () => import('@/views/oms/saleorder/detail/index.vue'),
+        name: 'SaleOrderDetail',
+        meta: {
+          title: '订单详情',
+          icon: 'ep:view',
+          activeMenu: '/oms/saleorder'
+        }
+      },
       {
         path: 'produceorder/add',
         component: () => import('@/views/oms/produceorder/form/index.vue'),
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/Home/Index.vue b/hangtag-ui/hangtag-ui-admin/src/views/Home/Index.vue
index ba4df79..649f7f1 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/Home/Index.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/views/Home/Index.vue
@@ -1,49 +1,101 @@
 <template>
   <div class="flex flex-col">
-<!--
-    &lt;!&ndash; 数据对照 &ndash;&gt;
+    <!-- 数据对照 -->
     <el-row :gutter="16" class="row">
       <el-col :md="6" :sm="12" :xs="24" :loading="loading">
         <ComparisonCard
           tag="今日"
+          lasttag="昨日数据"
           title="订单量"
-          :value="orderComparison?.value?.orderPayCount || 0"
-          :reference="orderComparison?.reference?.orderPayCount || 0"
+          :value="orderComparison?.value?.orderCount || 0"
+          :reference="orderComparison?.reference?.orderCount || 0"
         />
       </el-col>
 
+      <el-col :md="6" :sm="12" :xs="24" :loading="loading">
+        <ComparisonCard
+          tag="今日"
+          lasttag="昨日数据"
+          title="销售额"
+          prefix="￥"
+          :decimals="2"
+          :value="orderComparison?.value?.orderAmount || 0"
+          :reference="orderComparison?.reference?.orderAmount || 0"
+        />
+      </el-col>
+
+
       <el-col :md="6" :sm="12" :xs="24" :loading="loading">
         <ComparisonCard
           tag="本周"
+          lasttag="上周数据"
           title="订单量"
-          :value="orderComparison?.value?.orderPayCount || 0"
-          :reference="orderComparison?.reference?.orderPayCount || 0"
+          :value="orderComparison?.value2?.orderCount || 0"
+          :reference="orderComparison?.reference2?.orderCount || 0"
         />
       </el-col>
 
+
       <el-col :md="6" :sm="12" :xs="24" :loading="loading">
         <ComparisonCard
-          tag="本月"
-          title="订单量"
-          :value="orderComparison?.value?.orderPayCount || 0"
-          :reference="orderComparison?.reference?.orderPayCount || 0"
-        />
-      </el-col>
-      <el-col :md="6" :sm="12" :xs="24" :loading="loading">
-        <ComparisonCard
-          tag="本年"
-          title="订单量"
-          :value="orderComparison?.value?.orderPayCount || 0"
-          :reference="orderComparison?.reference?.orderPayCount || 0"
+          tag="本周"
+          lasttag="上周数据"
+          title="销售额"
+          prefix="￥"
+          :decimals="2"
+          :value="orderComparison?.value2?.orderAmount || 0"
+          :reference="orderComparison?.reference2?.orderAmount || 0"
         />
       </el-col>
     </el-row>
--->
 
+
+    <el-row :gutter="16" class="row">
+      <el-col :md="12">
+        <!-- 快捷入口 -->
+        <ShortcutCard />
+      </el-col>
+      <el-col :md="12">
+        <!-- 运营数据 -->
+        <OperationDataCard />
+      </el-col>
+    </el-row>
+    <!-- 交易量趋势 -->
+    <TradeTrendCard class="mb-4" />
   </div>
 </template>
 <script lang="ts" setup>
+import * as TradeStatisticsApi from '@/api/oms/statistics/trade'
+import {TradeOrderSummaryRespVO} from '@/api/oms/statistics/trade'
+import {DataComparisonRespVO} from '@/api/oms/statistics/common'
+import ComparisonCard from './components/ComparisonCard.vue'
+import ShortcutCard from './components/ShortcutCard.vue'
+import OperationDataCard from './components/OperationDataCard.vue'
+import TradeTrendCard from './components/TradeTrendCard.vue'
+import { fenToYuan } from '@/utils'
 
+/** 商城首页 */
+defineOptions({ name: 'MallHome' })
+
+const loading = ref(true) // 加载中
+const orderComparison = ref<DataComparisonRespVO<TradeOrderSummaryRespVO>>() // 交易对照数据
+
+/** 查询交易对照卡片数据 */
+const getOrderComparison = async () => {
+  orderComparison.value = await TradeStatisticsApi.getOrderComparison()
+}
+
+/** 查询会员用户数量对照卡片数据 */
+/*const getUserCountComparison = async () => {
+  userComparison.value = await MemberStatisticsApi.getUserCountComparison()
+}*/
+
+/** 初始化 **/
+onMounted(async () => {
+  loading.value = true
+  await Promise.all([getOrderComparison()])
+  loading.value = false
+})
 </script>
 <style lang="scss" scoped>
 .row {
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/Home/components/ComparisonCard.vue b/hangtag-ui/hangtag-ui-admin/src/views/Home/components/ComparisonCard.vue
new file mode 100644
index 0000000..ecf5f12
--- /dev/null
+++ b/hangtag-ui/hangtag-ui-admin/src/views/Home/components/ComparisonCard.vue
@@ -0,0 +1,43 @@
+<template>
+  <div class="flex flex-col gap-2 bg-[var(--el-bg-color-overlay)] p-6">
+    <div class="flex items-center justify-between text-gray-500">
+      <span>{{ title }}</span>
+      <el-tag>{{ tag }}</el-tag>
+    </div>
+    <div class="flex flex-row items-baseline justify-between">
+      <CountTo :prefix="prefix" :end-val="value" :decimals="decimals" class="text-3xl" />
+      <span :class="toNumber(percent) > 0 ? 'text-red-500' : 'text-green-500'">
+        {{ Math.abs(toNumber(percent)) }}%
+        <Icon :icon="toNumber(percent) > 0 ? 'ep:caret-top' : 'ep:caret-bottom'" class="!text-sm" />
+      </span>
+    </div>
+    <el-divider class="mb-1! mt-2!" />
+    <div class="flex flex-row items-center justify-between text-sm">
+      <span class="text-gray-500">{{lasttag}}</span>
+      <span>{{ prefix || '' }}{{ reference }}</span>
+    </div>
+  </div>
+</template>
+<script lang="ts" setup>
+import { propTypes } from '@/utils/propTypes'
+import { toNumber } from 'lodash-es'
+import { calculateRelativeRate } from '@/utils'
+
+/** 交易对照卡片 */
+defineOptions({ name: 'ComparisonCard' })
+
+const props = defineProps({
+  title: propTypes.string.def('').isRequired,
+  tag: propTypes.string.def(''),
+  lasttag: propTypes.string.def(''),
+  prefix: propTypes.string.def(''),
+  value: propTypes.number.def(0).isRequired,
+  reference: propTypes.number.def(0).isRequired,
+  decimals: propTypes.number.def(0)
+})
+
+// 计算环比
+const percent = computed(() =>
+  calculateRelativeRate(props.value as number, props.reference as number)
+)
+</script>
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/Home/components/OperationDataCard.vue b/hangtag-ui/hangtag-ui-admin/src/views/Home/components/OperationDataCard.vue
new file mode 100644
index 0000000..e53def9
--- /dev/null
+++ b/hangtag-ui/hangtag-ui-admin/src/views/Home/components/OperationDataCard.vue
@@ -0,0 +1,76 @@
+<template>
+  <el-card shadow="never">
+    <template #header>
+      <CardTitle title="运营数据" />
+    </template>
+    <div class="flex flex-row flex-wrap items-center gap-8 p-4">
+      <div
+        v-for="item in data"
+        :key="item.name"
+        class="h-20 w-20% flex flex-col cursor-pointer items-center justify-center gap-2"
+        @click="handleClick(item.routerName)"
+      >
+        <CountTo
+          :prefix="item.prefix"
+          :end-val="item.value"
+          :decimals="item.decimals"
+          class="text-3xl"
+        />
+        <span class="text-center">{{ item.name }}</span>
+      </div>
+    </div>
+  </el-card>
+</template>
+<script lang="ts" setup>
+import * as TradeStatisticsApi from '@/api/oms/statistics/trade'
+import { CardTitle } from '@/components/Card'
+
+/** 运营数据卡片 */
+defineOptions({ name: 'OperationDataCard' })
+
+const router = useRouter() // 路由
+
+/** 数据 */
+const data = reactive({
+  orderCountAA: { name: '已驳回订单', value: 0, routerName: 'SaleOrder' },
+  orderCountA: { name: '待提交订单', value: 0, routerName: 'SaleOrder' },
+  orderCountB: { name: '待审核订单', value: 0, routerName: 'SaleOrder' },
+  orderCountC: { name: '已完成订单', value: 0, routerName: 'SaleOrder' }
+})
+
+/** 查询订单数据 */
+const getOrderData = async () => {
+  const orderCount = await TradeStatisticsApi.getOrderCount()
+  if (orderCount.orderCountAA != null) {
+    data.orderCountAA.value = orderCount.orderCountAA
+  }
+  if (orderCount.orderCountA != null) {
+    data.orderCountA.value = orderCount.orderCountA
+  }
+  if (orderCount.orderCountB != null) {
+    data.orderCountB.value = orderCount.orderCountB
+  }
+  if (orderCount.orderCountC != null) {
+    data.orderCountC.value = orderCount.orderCountC
+  }
+}
+
+/**
+ * 跳转到对应页面
+ *
+ * @param routerName 路由页面组件的名称
+ */
+const handleClick = (routerName: string) => {
+  router.push({ name: routerName })
+}
+
+/** 激活时 */
+onActivated(() => {
+  getOrderData()
+})
+
+/** 初始化 **/
+onMounted(() => {
+  getOrderData()
+})
+</script>
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/Home/components/ShortcutCard.vue b/hangtag-ui/hangtag-ui-admin/src/views/Home/components/ShortcutCard.vue
new file mode 100644
index 0000000..b109adf
--- /dev/null
+++ b/hangtag-ui/hangtag-ui-admin/src/views/Home/components/ShortcutCard.vue
@@ -0,0 +1,58 @@
+<template>
+  <el-card shadow="never">
+    <template #header>
+      <CardTitle title="快捷入口" />
+    </template>
+    <div class="flex flex-row flex-wrap gap-8 p-4">
+      <div
+        v-for="menu in menuList"
+        :key="menu.name"
+        class="h-20 w-20% flex flex-col cursor-pointer items-center justify-center gap-2"
+        @click="handleMenuClick(menu.routerName)"
+      >
+        <div
+          :class="menu.bgColor"
+          class="h-48px w-48px flex items-center justify-center rounded text-white"
+        >
+          <Icon :icon="menu.icon" class="text-7.5!" />
+        </div>
+        <span>{{ menu.name }}</span>
+      </div>
+    </div>
+  </el-card>
+</template>
+<script lang="ts" setup>
+/** 快捷入口卡片 */
+import { CardTitle } from '@/components/Card'
+
+defineOptions({ name: 'ShortcutCard' })
+
+const router = useRouter() // 路由
+
+/** 菜单列表 */
+const menuList = [
+  { name: '客户管理', icon: 'ep:user-filled', bgColor: 'bg-red-400', routerName: 'Customer' },
+  {
+    name: '产品管理',
+    icon: 'fluent-mdl2:product',
+    bgColor: 'bg-orange-400',
+    routerName: 'ProductInfo'
+  },
+  { name: '订单管理', icon: 'ep:list', bgColor: 'bg-yellow-500', routerName: 'SaleOrder' },
+  {
+    name: '生产制单',
+    icon: 'fa-solid:project-diagram',
+    bgColor: 'bg-green-600',
+    routerName: 'ProduceOrder'
+  }
+]
+
+/**
+ * 跳转到菜单对应页面
+ *
+ * @param routerName 路由页面组件的名称
+ */
+const handleMenuClick = (routerName: string) => {
+  router.push({ name: routerName })
+}
+</script>
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/Home/components/TradeTrendCard.vue b/hangtag-ui/hangtag-ui-admin/src/views/Home/components/TradeTrendCard.vue
new file mode 100644
index 0000000..9cc96bb
--- /dev/null
+++ b/hangtag-ui/hangtag-ui-admin/src/views/Home/components/TradeTrendCard.vue
@@ -0,0 +1,207 @@
+<template>
+  <el-card shadow="never">
+    <template #header>
+      <div class="flex flex-row items-center justify-between">
+        <CardTitle title="交易量趋势" />
+        <!-- 查询条件 -->
+        <div class="flex flex-row items-center gap-2">
+          <el-radio-group v-model="timeRangeType" @change="handleTimeRangeTypeChange">
+            <el-radio-button v-for="[key, value] in timeRange.entries()" :key="key" :label="key">
+              {{ value.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </div>
+      </div>
+    </template>
+    <!-- 折线图 -->
+    <Echart :height="300" :options="eChartOptions" />
+  </el-card>
+</template>
+<script lang="ts" setup>
+import dayjs, { Dayjs } from 'dayjs'
+import { EChartsOption } from 'echarts'
+import * as TradeStatisticsApi from '@/api/oms/statistics/trade'
+import { formatDate } from '@/utils/formatTime'
+import { CardTitle } from '@/components/Card'
+
+/** 交易量趋势 */
+defineOptions({ name: 'TradeTrendCard' })
+
+enum TimeRangeTypeEnum {
+  DAY30 = 1,
+  WEEK = 7,
+  MONTH = 30,
+  YEAR = 365
+} // 日期类型
+const timeRangeType = ref(TimeRangeTypeEnum.DAY30) // 日期快捷选择按钮, 默认30天
+const loading = ref(true) // 加载中
+// 时间范围 Map
+const timeRange = new Map()
+  .set(TimeRangeTypeEnum.DAY30, {
+    name: '30天',
+    series: [
+      { name: '订单金额', type: 'bar', smooth: true, data: [] },
+      { name: '订单数量', type: 'line', smooth: true, data: [] }
+    ]
+  })
+  .set(TimeRangeTypeEnum.WEEK, {
+    name: '周',
+    series: [
+      { name: '上周金额', type: 'bar', smooth: true, data: [] },
+      { name: '本周金额', type: 'bar', smooth: true, data: [] },
+      { name: '上周数量', type: 'line', smooth: true, data: [] },
+      { name: '本周数量', type: 'line', smooth: true, data: [] }
+    ]
+  })
+  .set(TimeRangeTypeEnum.MONTH, {
+    name: '月',
+    series: [
+      { name: '上月金额', type: 'bar', smooth: true, data: [] },
+      { name: '本月金额', type: 'bar', smooth: true, data: [] },
+      { name: '上月数量', type: 'line', smooth: true, data: [] },
+      { name: '本月数量', type: 'line', smooth: true, data: [] }
+    ]
+  })
+  .set(TimeRangeTypeEnum.YEAR, {
+    name: '年',
+    series: [
+      { name: '去年金额', type: 'bar', smooth: true, data: [] },
+      { name: '今年金额', type: 'bar', smooth: true, data: [] },
+      { name: '去年数量', type: 'line', smooth: true, data: [] },
+      { name: '今年数量', type: 'line', smooth: true, data: [] }
+    ]
+  })
+/** 图表配置 */
+const eChartOptions = reactive<EChartsOption>({
+  grid: {
+    left: 20,
+    right: 20,
+    bottom: 20,
+    top: 80,
+    containLabel: true
+  },
+  legend: {
+    top: 50,
+    data: []
+  },
+  series: [],
+  toolbox: {
+    feature: {
+      // 数据区域缩放
+      dataZoom: {
+        yAxisIndex: false // Y轴不缩放
+      },
+      brush: {
+        type: ['lineX', 'clear'] // 区域缩放按钮、还原按钮
+      },
+      saveAsImage: { show: true, name: '订单量趋势' } // 保存为图片
+    }
+  },
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: {
+      type: 'cross'
+    },
+    padding: [5, 10]
+  },
+  xAxis: {
+    type: 'category',
+    inverse: true,
+    boundaryGap: false,
+    axisTick: {
+      show: false
+    },
+    data: [],
+    axisLabel: {
+      formatter: (date: string) => {
+        switch (timeRangeType.value) {
+          case TimeRangeTypeEnum.DAY30:
+            return formatDate(date, 'MM-DD')
+          case TimeRangeTypeEnum.WEEK:
+            let weekDay = formatDate(date, 'ddd')
+            if (weekDay == '0') weekDay = '日'
+            return '周' + weekDay
+          case TimeRangeTypeEnum.MONTH:
+            return formatDate(date, 'D')
+          case TimeRangeTypeEnum.YEAR:
+            return formatDate(date, 'M') + '月'
+          default:
+            return date
+        }
+      }
+    }
+  },
+  yAxis: {
+    axisTick: {
+      show: false
+    }
+  }
+}) as EChartsOption
+
+/** 时间范围类型单选按钮选中 */
+const handleTimeRangeTypeChange = async () => {
+  // 设置时间范围
+  let beginTime: Dayjs
+  let endTime: Dayjs
+  switch (timeRangeType.value) {
+    case TimeRangeTypeEnum.WEEK:
+      beginTime = dayjs().startOf('week')
+      endTime = dayjs().endOf('week')
+      break
+    case TimeRangeTypeEnum.MONTH:
+      beginTime = dayjs().startOf('month')
+      endTime = dayjs().endOf('month')
+      break
+    case TimeRangeTypeEnum.YEAR:
+      beginTime = dayjs().startOf('year')
+      endTime = dayjs().endOf('year')
+      break
+    case TimeRangeTypeEnum.DAY30:
+    default:
+      beginTime = dayjs().subtract(30, 'day').startOf('d')
+      endTime = dayjs().endOf('d')
+      break
+  }
+  // 发送时间范围选中事件
+  await getOrderCountTrendComparison(beginTime, endTime)
+}
+
+/** 查询订单数量趋势对照数据 */
+const getOrderCountTrendComparison = async (
+  beginTime: dayjs.ConfigType,
+  endTime: dayjs.ConfigType
+) => {
+  loading.value = true
+  // 查询数据
+  const list = await TradeStatisticsApi.getOrderCountTrendComparison(
+    timeRangeType.value,
+    beginTime,
+    endTime
+  )
+  // 处理数据
+  const dates: string[] = []
+  const series = [...timeRange.get(timeRangeType.value).series]
+  for (let item of list) {
+    dates.push(item.value.date)
+    if (series.length === 2) {
+      series[0].data.push(item?.value?.orderAmount || 0) // 当前金额
+      series[1].data.push(item?.value?.orderCount || 0) // 当前数量
+    } else {
+      series[0].data.push(item?.reference?.orderAmount || 0) // 对照金额
+      series[1].data.push(item?.value?.orderAmount || 0) // 当前金额
+      series[2].data.push(item?.reference?.orderCount || 0) // 对照数量
+      series[3].data.push(item?.value?.orderCount || 0) // 当前数量
+    }
+  }
+  eChartOptions.xAxis!['data'] = dates
+  eChartOptions.series = series
+  // legend在4个切换到2个的时候，还是显示成4个，需要手动配置一下
+  eChartOptions.legend['data'] = series.map((item) => item.name)
+  loading.value = false
+}
+
+/** 初始化 **/
+onMounted(() => {
+  handleTimeRangeTypeChange()
+})
+</script>
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/CustomerAssignBrandForm.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/CustomerAssignBrandForm.vue
index 3a5f88b..64cf03a 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/CustomerAssignBrandForm.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/CustomerAssignBrandForm.vue
@@ -1,12 +1,12 @@
 <template>
   <Dialog v-model="dialogVisible" title="品牌权限">
     <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
-<!--      <el-form-item label="角色名称">
+      <el-form-item label="客户编码">
+        <el-tag>{{ formData.number }}</el-tag>
+      </el-form-item>
+      <el-form-item label="客户名称">
         <el-tag>{{ formData.name }}</el-tag>
       </el-form-item>
-      <el-form-item label="角色标识">
-        <el-tag>{{ formData.code }}</el-tag>
-      </el-form-item>-->
       <el-form-item label="品牌权限">
         <el-card class="cardHeight">
 <!--          <template #header>
@@ -49,6 +49,7 @@ import { defaultProps, handleTree } from '@/utils/tree'
 import * as CustomerApi from '@/api/oms/customer'
 import * as CustomerBrandApi from '@/api/oms/customerbrand'
 import * as BrandApi from '@/api/oms/brand'
+import {CustomerVO} from "@/api/oms/customer";
 
 defineOptions({ name: 'SystemRoleAssignMenuForm' })
 
@@ -60,7 +61,7 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
 const formData = reactive({
   id: undefined,
   name: '',
-  code: '',
+  number: '',
   menuIds: []
 })
 const formRef = ref() // 表单 Ref
@@ -70,7 +71,7 @@ const treeRef = ref() // 菜单树组件 Ref
 const treeNodeAll = ref(false) // 全选/全不选
 
 /** 打开弹窗 */
-const open = async (row: RoleApi.RoleVO) => {
+const open = async (row: CustomerApi.CustomerVO) => {
   dialogVisible.value = true
   resetForm()
   // 加载 Menu 列表。注意，必须放在前面，不然下面 setChecked 没数据节点
@@ -78,7 +79,7 @@ const open = async (row: RoleApi.RoleVO) => {
   // 设置数据
   formData.id = row.id
   formData.name = row.name
-  formData.code = row.code
+  formData.number = row.number
   formLoading.value = true
   try {
     formData.value.menuIds = await CustomerBrandApi.getCustomerBrandList(row.id)
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/ProduceOrderForm.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/ProduceOrderForm.vue
index 84b436c..ea182e1 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/ProduceOrderForm.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/ProduceOrderForm.vue
@@ -94,6 +94,7 @@
       </el-form-item>
     </el-form>
     <template #footer>
+      <el-button @click="downpdf" type="primary" v-if="formData.id" :disabled="formLoading">下 载</el-button>
       <el-button @click="preview" type="primary" :disabled="formLoading">预 览</el-button>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
@@ -228,6 +229,36 @@ const resetForm = () => {
 }
 
 
+const downpdf = async () => {
+  const id = formData.value.id;
+  if (id) {
+    formData.value = await ProduceOrderApi.getProduceOrder(id)
+  }
+  //日期转换
+  formData.value.contractDateStr = formatDate(formData.value.contractDate,'YYYY-MM-DD')
+  formData.value.reportDateStr = formatDate(formData.value.reportDate,'YYYY-MM-DD')
+  formData.value.reportTimeStr = formatDate(formData.value.reportDate,'HH:mm:ss')
+  formData.value.produceDateStr = formatDate(formData.value.produceDate,'YYYY-MM-DD')
+  formData.value.inspectionDateStr = formatDate(formData.value.inspectionDate,'YYYY-MM-DD')
+  formData.value.deliverydateStr = formatDate(formData.value.deliverydate,'YYYY-MM-DD')
+  //formData.value.saleContractNo = formData.value.orderNo
+
+  let printData = JSON.stringify(formData.value)
+  printData = JSON.parse(printData)
+  let hiprintTemplate = new hiprint.PrintTemplate({template: template1});
+
+  // 弹出浏览器打印窗口，并填充 字段名：name 的元素
+  // hiprintTemplate.print(hiprintTemplate);
+  //let html = hiprintTemplate.getHtml(printData);
+  //previewRef.value.showModal(html);
+
+  hiprintTemplate.toPdf(printData, '生产制单_' + formData.value.billno).then((res) => {
+    console.log('type:', 'pdfobjectnewwindow');
+    console.log(res);
+  });
+
+}
+
 const preview = async () => {
   const id = formData.value.id;
   if (id) {
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/detail/index.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/detail/index.vue
new file mode 100644
index 0000000..5b643d1
--- /dev/null
+++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/detail/index.vue
@@ -0,0 +1,357 @@
+<template>
+  <ContentWrap>
+    <el-button
+      v-if="formData.billStatus != 'C'"
+      type="primary"
+      @click="handleSave"
+    >保存</el-button>
+    <el-button
+      v-if="formData.billStatus == 'B'"
+      type="primary"
+      @click="handleAudit"
+    >审核</el-button>
+    <el-button
+      v-if="formData.billStatus == 'A' || formData.billStatus == 'B' "
+      type="primary"
+      @click="remark">备注</el-button>
+    <!-- 订单信息 -->
+    <el-descriptions title="订单信息">
+      <el-descriptions-item label="订单号: ">{{ formData.billno }}</el-descriptions-item>
+      <el-descriptions-item label="业务日期: ">{{ formatDate(formData.bizdate,'YYYY-MM-DD') }}</el-descriptions-item>
+      <el-descriptions-item label="确认日期: ">{{ formatDate(formData.confirmdate,'YYYY-MM-DD') }}</el-descriptions-item>
+      <el-descriptions-item label="计划日期: ">{{ formatDate(formData.plansenddate,'YYYY-MM-DD') }}</el-descriptions-item>
+      <el-descriptions-item label="手机: ">{{ formData.phone }}</el-descriptions-item>
+      <el-descriptions-item label="传真: ">{{ formData.fax }}</el-descriptions-item>
+      <el-descriptions-item label="邮件: ">{{ formData.emails }}</el-descriptions-item>
+      <el-descriptions-item label="客户编号: ">{{ formData?.customer?.number }}</el-descriptions-item>
+      <el-descriptions-item label="客户名称: ">{{ formData?.customer?.name }}</el-descriptions-item>
+      <el-descriptions-item label="客户公司: ">{{ formData?.customer?.company }}</el-descriptions-item>
+      <el-descriptions-item label="订单备注: ">{{ formData.remark }}</el-descriptions-item>
+    </el-descriptions>
+
+    <!-- 订单状态 -->
+    <el-descriptions :column="3" title="订单状态">
+      <el-descriptions-item label="单据状态: ">
+        <dict-tag :type="DICT_TYPE.OMS_BILL_STATUS" :value="formData.billStatus" />
+      </el-descriptions-item>
+      <el-descriptions-item label="订单状态: ">
+        <dict-tag :type="DICT_TYPE.OMS_ORDER_STATUS" :value="formData.orderStatus" />
+      </el-descriptions-item>
+      <el-descriptions-item v-if="formData.billStatus == 'AA' " label="驳回原因: ">{{ formData?.rejectReason }}</el-descriptions-item>
+      <el-descriptions-item v-hasPermi="['oms:sale-order:update']" label-class-name="no-colon">
+        <!-- 待发货 -->
+        <template >
+          <!-- 快递发货 -->
+          <el-button
+            type="primary"
+            @click="delivery"
+          >
+            发货
+          </el-button>
+          <el-button
+            type="primary"
+            @click="updateAddress"
+          >
+            修改地址
+          </el-button>
+          <!-- 到店自提 -->
+          <el-button
+            type="primary"
+            @click="handleAudit"
+          >
+            核销
+          </el-button>
+        </template>
+      </el-descriptions-item>
+<!--      <el-descriptions-item>
+        <template #label><span style="color: red">提醒: </span></template>
+        买家付款成功后，货款将直接进入您的商户号（微信、支付宝）<br />
+        请及时关注你发出的包裹状态，确保可以配送至买家手中 <br />
+        如果买家表示没收到货或货物有问题，请及时联系买家处理，友好协商
+      </el-descriptions-item>-->
+    </el-descriptions>
+
+
+    <!-- 商品信息 -->
+    <el-descriptions title="产品信息">
+      <el-descriptions-item labelClassName="no-colon">
+        <el-row :gutter="20">
+          <el-col :span="544">
+            <el-form
+              ref="itemFormEntrysRef"
+              :model="formData.entrys"
+              :rules="itemFormEntrysRules"
+              label-width="0px"
+              :inline-message="true"
+            >
+            <el-table :data="formData.entrys"
+                      border
+                      :on-cell-click="cellClick"
+
+            >
+
+              <el-table-column label="产品编码" prop="materialName" width="150"/>
+              <el-table-column label="产品名称" prop="materialName" width="150"/>
+              <el-table-column label="产品规格" prop="materialSpec" width="150" />
+              <el-table-column label="数量" prop="qty" width="150" />
+              <el-table-column label="单价" width="250">
+                <template #default="{ row, $index }">
+                  <el-form-item  :prop="`${$index}.price`" :rules="itemFormEntrysRules.price" class="mb-0px!"
+                      v-if="row.billStatus!='C'"
+                  >
+                  <el-input-number
+                    style="width: 100%"
+                    v-model.number="row.price"
+                    :step="0.001"
+                    :controls="false"
+                    @change="changeRow(row,'price')"
+                    placeholder="请输入单价"
+                  />
+                  </el-form-item>
+                  <span v-else @click="editRow($index)">{{ row.price }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="折扣(%)" prop="discount" width="250" >
+                <template #default="{ row, $index }">
+                  <el-input-number
+                    style="width: 100%"
+                    v-if="row.billStatus!='C'"
+                    v-model.number="row.discount"
+                    :step="0.001"
+                    :controls="false"
+                    min="0"
+                    max="100"
+                    @change="changeRow(row,'discount')"
+                    placeholder="请输入折扣(%)"
+                  />
+                  <span v-else @click="editRow($index)">{{ row.discount }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="金额" prop="amount" width="250" />
+<!--              <el-table-column label="合计" prop="payPrice" width="150">
+                <template #default="{ row }">{{ fenToYuan(row.payPrice) }}元</template>
+              </el-table-column>-->
+            </el-table>
+            </el-form>
+          </el-col>
+          <el-col :span="10" />
+        </el-row>
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <!-- 订单信息 -->
+    <el-descriptions title="发票信息">
+      <el-descriptions-item label="发票抬头: ">{{ formData.invoiceCode }}</el-descriptions-item>
+      <el-descriptions-item label="发票名称: ">{{ formData.invoiceName }}</el-descriptions-item>
+      <el-descriptions-item label="货币: ">{{ formData.currency }}</el-descriptions-item>
+      <el-descriptions-item label="发票备注: ">{{ formData.invoiceRemarks }}</el-descriptions-item>
+    </el-descriptions>
+
+
+
+    <!-- 订单信息 -->
+    <el-descriptions title="制单信息">
+      <el-descriptions-item label="创建时间: ">{{ formatDate(formData.createTime) }}</el-descriptions-item>
+      <el-descriptions-item label="修改人: ">{{ formData.updaterName }}</el-descriptions-item>
+      <el-descriptions-item label="修改时间: ">{{ formatDate(formData.updateTime) }}</el-descriptions-item>
+      <el-descriptions-item label="审核人: ">{{ formData.auditorName }}</el-descriptions-item>
+      <el-descriptions-item label="审核时间: ">{{ formatDate(formData.auditorTime) }}</el-descriptions-item>
+    </el-descriptions>
+  </ContentWrap>
+
+  <!-- 各种操作的弹窗 -->
+  <OrderUpdateRemarkForm ref="updateRemarkForm" @success="getDetail" />
+  <OrderUpdateAddressForm ref="updateAddressFormRef" @success="getDetail" />
+</template>
+<script lang="ts" setup>
+import { fenToYuan } from '@/utils'
+import { DICT_TYPE, getDictLabel, getDictObj } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
+import OrderUpdateRemarkForm from '@/views/oms/saleorder/form/OrderUpdateRemarkForm.vue'
+import OrderUpdateAddressForm from '@/views/oms/saleorder/form/OrderUpdateAddressForm.vue'
+import { useTagsViewStore } from '@/store/modules/tagsView'
+import { propTypes } from '@/utils/propTypes'
+import {SaleOrderApi, SaleOrderVO} from "@/api/oms/saleorder";
+
+defineOptions({ name: 'TradeOrderDetail' })
+
+const message = useMessage() // 消息弹窗
+
+
+
+const itemFormEntrysRef = ref() // 表单 Ref
+
+const itemFormEntrysRules = reactive({
+  price: [{ required: true, message: '单价不能为空', trigger: 'blur' }],
+})
+
+// 订单详情
+const formData = ref<SaleOrderVO>({
+  logs: []
+})
+
+/** 各种操作 */
+const updateRemarkForm = ref() // 订单备注表单 Ref
+const remark = () => {
+  updateRemarkForm.value?.open(formData.value)
+}
+
+const updateAddressFormRef = ref() // 收货地址表单 Ref
+const updateAddress = () => {
+  updateAddressFormRef.value?.open(formData.value)
+}
+
+
+
+
+
+
+const changeRow = async (row,key:string) => {
+  if('price' == key || 'discount' == key ){
+    let price = row.price
+    let qty = row.qty
+    let discount = row.discount
+    row.amount = (price*qty) * (1-(discount/100))
+    //100*(1-(2/100))
+  }
+}
+const handleSave = async () => {
+  try {
+    // 校验表单
+    await itemFormEntrysRef.value.validate()
+    // 提交
+    await SaleOrderApi.updateOrderEntrys(formData.value)
+    message.success('保存成功')
+    // 刷新列表
+    await getDetail()
+  } catch {}
+}
+
+/** 审核 */
+const handleAudit = async () => {
+  try {
+    // 校验表单
+    await itemFormEntrysRef.value.validate()
+    // 二次确认
+    await message.confirm('确认审核订单吗？')
+    // 提交
+    await SaleOrderApi.updateSaleOrderBillStatus([formData.value.id],'audit')
+    message.success('审核成功')
+    // 刷新列表
+    await getDetail()
+  } catch {}
+}
+
+/** 获得详情 */
+const { params } = useRoute() // 查询参数
+const props = defineProps({
+  id: propTypes.number.def(undefined), // 订单ID
+  showPickUp: propTypes.bool.def(true) // 显示核销按钮
+})
+const id = (params.id || props.id) as unknown as number
+const getDetail = async () => {
+  if (id) {
+    const res = (await SaleOrderApi.getSaleOrder(id)) as SaleOrderVO
+    // 没有表单信息则关闭页面返回
+    if (!res) {
+      message.error('销售订单不存在')
+      close()
+    }
+    formData.value = res
+  }
+}
+
+
+/** 关闭 tag */
+const { delView } = useTagsViewStore() // 视图操作
+const { push, currentRoute } = useRouter() // 路由
+const close = () => {
+  delView(unref(currentRoute))
+  push({ name: 'SaleOrder' })
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  await getDetail()
+})
+</script>
+<style lang="scss" scoped>
+:deep(.el-descriptions) {
+  &:not(:nth-child(1)) {
+    margin-top: 20px;
+  }
+
+  .el-descriptions__title {
+    display: flex;
+    align-items: center;
+
+    &::before {
+      display: inline-block;
+      width: 3px;
+      height: 20px;
+      margin-right: 10px;
+      background-color: #409eff;
+      content: '';
+    }
+  }
+
+  .el-descriptions-item__container {
+    margin: 0 10px;
+
+    .no-colon {
+      margin: 0;
+
+      &::after {
+        content: '';
+      }
+    }
+  }
+}
+
+// 时间线样式调整
+:deep(.el-timeline) {
+  margin: 10px 0 0 160px;
+
+  .el-timeline-item__wrapper {
+    position: relative;
+    top: -20px;
+
+    .el-timeline-item__timestamp {
+      position: absolute !important;
+      top: 10px;
+      left: -150px;
+    }
+  }
+
+  .el-timeline-right-content {
+    display: flex;
+    align-items: center;
+    min-height: 30px;
+    padding: 10px;
+    background-color: #f7f8fa;
+
+    &::before {
+      position: absolute;
+      top: 10px;
+      left: 13px; /* 将伪元素水平居中 */
+      border-color: transparent #f7f8fa transparent transparent; /* 尖角颜色，左侧朝向 */
+      border-style: solid;
+      border-width: 8px; /* 调整尖角大小 */
+      content: ''; /* 必须设置 content 属性 */
+    }
+  }
+
+  .dot-node-style {
+    position: absolute;
+    left: -5px;
+    display: flex;
+    width: 20px;
+    height: 20px;
+    font-size: 10px;
+    color: #fff;
+    border-radius: 50%;
+    justify-content: center;
+    align-items: center;
+  }
+}
+</style>
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/form/OrderUpdateAddressForm.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/form/OrderUpdateAddressForm.vue
new file mode 100644
index 0000000..77cccdb
--- /dev/null
+++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/form/OrderUpdateAddressForm.vue
@@ -0,0 +1,98 @@
+<template>
+  <Dialog v-model="dialogVisible" title="修改订单收货地址" width="35%">
+    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="120px">
+      <el-form-item label="收件人">
+        <el-input v-model="formData.receiverName" placeholder="请输入收件人名称" />
+      </el-form-item>
+      <el-form-item label="手机号">
+        <el-input v-model="formData.receiverMobile" placeholder="请输入收件人手机号" />
+      </el-form-item>
+      <el-form-item label="所在地">
+        <el-tree-select
+          v-model="formData.receiverAreaId"
+          :data="areaList"
+          :props="defaultProps"
+          :render-after-expand="true"
+        />
+      </el-form-item>
+      <el-form-item label="详细地址">
+        <el-input
+          v-model="formData.receiverDetailAddress"
+          :rows="3"
+          placeholder="请输入收件人详细地址"
+          type="textarea"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { getAreaTree } from '@/api/system/area'
+import { copyValueToTarget } from '@/utils'
+import { defaultProps } from '@/utils/tree'
+import {SaleOrderApi,SaleOrderVO} from "@/api/oms/saleorder";
+
+defineOptions({ name: 'OrderUpdateAddressForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  id: undefined, // 订单编号
+  receiverName: '', // 收件人名称
+  receiverMobile: '', // 收件人手机
+  receiverAreaId: null, //收件人地区编号
+  receiverDetailAddress: '' //收件人详细地址
+})
+const areaList = ref([]) // 地区列表
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (row: SaleOrderVO) => {
+  resetForm()
+  // 设置数据
+  copyValueToTarget(formData.value, row)
+  dialogVisible.value = true
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = unref(formData)
+    await SaleOrderApi.updateOrderAddress(data)
+    message.success(t('common.updateSuccess'))
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success', true)
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined, // 订单编号
+    receiverName: '', // 收件人名称
+    receiverMobile: '', // 收件人手机
+    receiverAreaId: null, //收件人地区编号
+    receiverDetailAddress: '' //收件人详细地址
+  }
+  formRef.value?.resetFields()
+}
+
+onMounted(async () => {
+  // 获得地区列表
+  areaList.value = await getAreaTree()
+})
+</script>
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/form/OrderUpdateRemarkForm.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/form/OrderUpdateRemarkForm.vue
new file mode 100644
index 0000000..ca2ff94
--- /dev/null
+++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/form/OrderUpdateRemarkForm.vue
@@ -0,0 +1,70 @@
+<template>
+  <Dialog v-model="dialogVisible" title="订单备注" width="45%">
+    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
+      <el-form-item label="备注">
+        <el-input
+          v-model="formData.remark"
+          :rows="3"
+          placeholder="请输入订单备注"
+          type="textarea"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import {SaleOrderApi,SaleOrderVO} from "@/api/oms/saleorder";
+
+defineOptions({ name: 'OrderUpdateRemarkForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  id: undefined, // 订单编号
+  remark: '' // 订单备注
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (row: SaleOrderVO) => {
+  resetForm()
+  // 设置数据
+  formData.value.id = row.id
+  formData.value.remark = row.remark
+  dialogVisible.value = true
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = unref(formData)
+    await SaleOrderApi.updateOrderRemark(data)
+    message.success(t('common.updateSuccess'))
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success', true)
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined, // 订单编号
+    remark: '' // 订单备注
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/index.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/index.vue
index 4a14b47..70113cd 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/index.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/index.vue
@@ -179,6 +179,7 @@
     <el-table v-loading="loading" :data="list" :stripe="true"
               :show-overflow-tooltip="true"
               @selection-change="handleSelectionChange"
+              :row-class-name="tableRowClassName"
     >
       <el-table-column width="30" label="选择" type="selection" />
       <el-table-column label="单据编号" align="center" prop="billno"     width="120px"/>
@@ -235,12 +236,13 @@
       <el-table-column label="操作" align="center" width="150" fixed="right">
         <template #default="scope">
           <el-button
+            v-hasPermi="['oms:sale-order:query']"
             link
             type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['oms:sale-order:update']"
+            @click="openDetail(scope.row.id)"
           >
-            编辑
+            <Icon icon="ep:notification" />
+            详情
           </el-button>
           <el-button
             link
@@ -293,6 +295,7 @@ import {checkPermi} from "@/utils/permission";
 /** 销售订单 列表 */
 defineOptions({ name: 'SaleOrder' })
 
+const { currentRoute, push } = useRouter() // 路由跳转
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
@@ -536,6 +539,34 @@ const rejectCancel = () =>{
 }
 
 
+
+/** 查看订单详情 */
+const openDetail = (id: number) => {
+  push({ name: 'SaleOrderDetail', params: { id } })
+}
+
+const tableRowClassName = ({
+                             row,
+                             rowIndex,
+                           }: {
+  row: SaleOrderVO
+  rowIndex: number
+}) => {
+  if (row.billStatus === 'AA') {
+    return 'warning-row'
+  }
+  return ''
+}
+
+
+// 监听路由变化更新列表，解决订单保存/更新后，列表不刷新的问题。
+watch(
+  () => currentRoute.value,
+  () => {
+    getList()
+  }
+)
+
 /** 激活时 */
 onActivated(() => {
   getList()
@@ -547,3 +578,13 @@ onMounted(() => {
   getTabsCount()
 })
 </script>
+
+
+<style>
+  .el-table .warning-row {
+    --el-table-tr-bg-color: #D4D4D4;
+  }
+  .el-table .success-row {
+    --el-table-tr-bg-color: var(--el-color-success-light-9);
+  }
+</style>
diff --git a/hangtag-ui/hangtag-ui-front/src/api/oms/saleorder/index.ts b/hangtag-ui/hangtag-ui-front/src/api/oms/saleorder/index.ts
new file mode 100644
index 0000000..24f275e
--- /dev/null
+++ b/hangtag-ui/hangtag-ui-front/src/api/oms/saleorder/index.ts
@@ -0,0 +1,108 @@
+import request from '@/config/axios'
+
+// 销售订单 VO
+export interface SaleOrderVO {
+  id: number // 客户id
+  customerId: number // 客户id
+  bizdate: Date // 业务日期
+  remark: string // 备注
+  confirmdate: Date // 确认日期
+  plansenddate: Date // 计划日期
+  phone: string // 手机
+  remarks: string // 备注
+  emails: string // 邮件列表，数据格式：xxx@xx.com;xxx@xx.com;
+  invoiceCode: string // 发票抬头
+  invoiceName: string // 发票名称
+  address: string // 地址
+  currency: string // 货币
+  invoiceRemarks: string // 发票备注
+}
+
+// 销售订单 API
+export const SaleOrderApi = {
+  // 查询销售订单分页
+  getSaleOrderPage: async (params: any) => {
+    return await request.get({ url: `/oms/app/sale-order/page`, params })
+  },
+
+  // 查询销售订单详情
+  getSaleOrder: async (id: number) => {
+    return await request.get({ url: `/oms/app/sale-order/get?id=` + id })
+  },
+
+  // 新增销售订单
+  createSaleOrder: async (data: SaleOrderVO) => {
+    return await request.post({ url: `/oms/sale-order/create`, data })
+  },
+
+  // 修改销售订单
+  updateSaleOrder: async (data: SaleOrderVO) => {
+    return await request.put({ url: `/oms/app/sale-order/update`, data })
+  },
+
+  // 删除销售订单
+  deleteSaleOrder: async (id: number) => {
+    return await request.delete({ url: `/oms/app/sale-order/delete?id=` + id })
+  },
+
+  // 导出销售订单 Excel
+  exportSaleOrder: async (params) => {
+    return await request.download({ url: `/oms/app/sale-order/export-excel`, params })
+  },
+
+// ==================== 子表（销售订单明细） ====================
+
+  // 获得销售订单明细列表
+  getSaleOrderEntryListByParentId: async (parentId) => {
+    return await request.get({ url: `/oms/app/sale-order/sale-order-entry/list-by-parent-id?parentId=` + parentId })
+  },
+
+  // 获得 销售 列表 tabsCount
+  getTabsCount: async () => {
+    return request.get({ url: '/oms/app/sale-order/get-count' })
+  },
+
+  // 更新订单状态
+  updateSaleOrderBillStatus: async (ids: number[],status: string) => {
+    return await request.post({
+      url: `/oms/sale-order/updateSaleOrderBillStatus`,
+      params: {
+        ids: ids.join(','),
+        status: status
+      }
+    })
+  },
+  // 更新订单状态
+  generateProduceOrder: async (ids: number[]) => {
+    return await request.put({
+      url: `/oms/sale-order/generateProduceOrder`,
+      params: {
+        ids: ids.join(',')
+      }
+    })
+  },
+
+  // 驳回
+  rejectOrder: async (data) => {
+    return await request.post({
+      url: `/oms/sale-order/rejectOrder`,
+      data: data
+    })
+  },
+
+  // 修改订单地址
+  updateOrderAddress: async (data: any) => {
+    return await request.put({ url: `/oms/sale-order/update-address`, data })
+  },
+
+  // 订单备注
+  updateOrderRemark: async (data: any) => {
+    return await request.put({ url: `/oms/sale-order/update-remark`, data })
+  },
+
+  // 更新分录数据
+  updateOrderEntrys: async (data: SaleOrderVO) => {
+    return await request.put({ url: `/oms/sale-order/update-entrys`, data })
+  }
+
+}
diff --git a/hangtag-ui/hangtag-ui-front/src/api/oms/statistics/common.ts b/hangtag-ui/hangtag-ui-front/src/api/oms/statistics/common.ts
new file mode 100644
index 0000000..753e34d
--- /dev/null
+++ b/hangtag-ui/hangtag-ui-front/src/api/oms/statistics/common.ts
@@ -0,0 +1,7 @@
+/** 数据对照 Response VO */
+export interface DataComparisonRespVO<T> {
+  value: T
+  reference: T
+  value2: T
+  reference2: T
+}
diff --git a/hangtag-ui/hangtag-ui-front/src/api/oms/statistics/trade.ts b/hangtag-ui/hangtag-ui-front/src/api/oms/statistics/trade.ts
new file mode 100644
index 0000000..26ee931
--- /dev/null
+++ b/hangtag-ui/hangtag-ui-front/src/api/oms/statistics/trade.ts
@@ -0,0 +1,101 @@
+import request from '@/config/axios'
+import dayjs from 'dayjs'
+import { formatDate } from '@/utils/formatTime'
+import { DataComparisonRespVO } from '@/api/oms/statistics/common'
+
+/** 交易统计 Response VO */
+export interface TradeSummaryRespVO {
+  yesterdayOrderCount: number
+  monthOrderCount: number
+  yesterdayPayPrice: number
+  monthPayPrice: number
+}
+
+/** 交易状况 Request VO */
+export interface TradeTrendReqVO {
+  times: [dayjs.ConfigType, dayjs.ConfigType]
+}
+
+/** 交易订单数量 Response VO */
+export interface TradeOrderCountRespVO {
+  /** 驳回 */
+  orderCountAA?: number
+  /** 待提交 */
+  orderCountA?: number
+  /** 提交中 */
+  orderCountB?: number
+  /** 已审核 */
+  orderCountC?: number
+}
+
+/** 交易订单统计 Response VO */
+export interface TradeOrderSummaryRespVO {
+  /** 支付订单商品数 */
+  orderCount?: number
+  /** 总支付金额，单位：分 */
+  orderAmount?: number
+}
+
+/** 订单量趋势统计 Response VO */
+export interface TradeOrderTrendRespVO {
+  /** 日期 */
+  date: string
+  /** 订单数量 */
+  orderCount: number
+  /** 订单支付金额 */
+  orderAmount: number
+}
+
+// 查询交易统计
+export const getTradeStatisticsSummary = () => {
+  return request.get<DataComparisonRespVO<TradeSummaryRespVO>>({
+    url: '/oms/app/statistics/app/trade/summary'
+  })
+}
+
+
+
+// 获得交易状况明细
+export const getTradeStatisticsList = (params: TradeTrendReqVO) => {
+  return request.get<TradeTrendSummaryRespVO[]>({
+    url: '/oms/app/statistics/trade/list',
+    params: formatDateParam(params)
+  })
+}
+
+// 导出交易状况明细
+export const exportTradeStatisticsExcel = (params: TradeTrendReqVO) => {
+  return request.download({
+    url: '/oms/app/statistics/trade/export-excel',
+    params: formatDateParam(params)
+  })
+}
+
+// 获得交易订单数量
+export const getOrderCount = async () => {
+  return await request.get<TradeOrderCountRespVO>({ url: `/oms/app/statistics/trade/order-count` })
+}
+
+// 获得交易订单数量对照
+export const getOrderComparison = async () => {
+  return await request.get<DataComparisonRespVO<TradeOrderSummaryRespVO>>({
+    url: `/oms/app/statistics/trade/order-comparison`
+  })
+}
+
+// 获得订单量趋势统计
+export const getOrderCountTrendComparison = (
+  type: number,
+  beginTime: dayjs.ConfigType,
+  endTime: dayjs.ConfigType
+) => {
+  return request.get<DataComparisonRespVO<TradeOrderTrendRespVO>[]>({
+    url: '/oms/app/statistics/trade/order-count-trend',
+    params: { type, beginTime: formatDate(beginTime), endTime: formatDate(endTime) }
+  })
+}
+
+/** 时间参数需要格式化, 确保接口能识别 */
+const formatDateParam = (params: TradeTrendReqVO) => {
+  return { times: [formatDate(params.times[0]), formatDate(params.times[1])] } as TradeTrendReqVO
+}
diff --git a/hangtag-ui/hangtag-ui-front/src/views/Home/Index.vue b/hangtag-ui/hangtag-ui-front/src/views/Home/Index.vue
index b832ae9..4b7b819 100644
--- a/hangtag-ui/hangtag-ui-front/src/views/Home/Index.vue
+++ b/hangtag-ui/hangtag-ui-front/src/views/Home/Index.vue
@@ -19,6 +19,17 @@
         </el-row>
       </el-skeleton>
     </el-card>
+
+    <el-row :gutter="16" class="row">
+      <el-col :md="12">
+        <!-- 快捷入口 -->
+        <ShortcutCard />
+      </el-col>
+      <el-col :md="12">
+        <!-- 运营数据 -->
+        <OperationDataCard />
+      </el-col>
+    </el-row>
   </div>
 
 </template>
diff --git a/hangtag-ui/hangtag-ui-front/src/views/Home/components/ComparisonCard.vue b/hangtag-ui/hangtag-ui-front/src/views/Home/components/ComparisonCard.vue
new file mode 100644
index 0000000..ecf5f12
--- /dev/null
+++ b/hangtag-ui/hangtag-ui-front/src/views/Home/components/ComparisonCard.vue
@@ -0,0 +1,43 @@
+<template>
+  <div class="flex flex-col gap-2 bg-[var(--el-bg-color-overlay)] p-6">
+    <div class="flex items-center justify-between text-gray-500">
+      <span>{{ title }}</span>
+      <el-tag>{{ tag }}</el-tag>
+    </div>
+    <div class="flex flex-row items-baseline justify-between">
+      <CountTo :prefix="prefix" :end-val="value" :decimals="decimals" class="text-3xl" />
+      <span :class="toNumber(percent) > 0 ? 'text-red-500' : 'text-green-500'">
+        {{ Math.abs(toNumber(percent)) }}%
+        <Icon :icon="toNumber(percent) > 0 ? 'ep:caret-top' : 'ep:caret-bottom'" class="!text-sm" />
+      </span>
+    </div>
+    <el-divider class="mb-1! mt-2!" />
+    <div class="flex flex-row items-center justify-between text-sm">
+      <span class="text-gray-500">{{lasttag}}</span>
+      <span>{{ prefix || '' }}{{ reference }}</span>
+    </div>
+  </div>
+</template>
+<script lang="ts" setup>
+import { propTypes } from '@/utils/propTypes'
+import { toNumber } from 'lodash-es'
+import { calculateRelativeRate } from '@/utils'
+
+/** 交易对照卡片 */
+defineOptions({ name: 'ComparisonCard' })
+
+const props = defineProps({
+  title: propTypes.string.def('').isRequired,
+  tag: propTypes.string.def(''),
+  lasttag: propTypes.string.def(''),
+  prefix: propTypes.string.def(''),
+  value: propTypes.number.def(0).isRequired,
+  reference: propTypes.number.def(0).isRequired,
+  decimals: propTypes.number.def(0)
+})
+
+// 计算环比
+const percent = computed(() =>
+  calculateRelativeRate(props.value as number, props.reference as number)
+)
+</script>
diff --git a/hangtag-ui/hangtag-ui-front/src/views/Home/components/OperationDataCard.vue b/hangtag-ui/hangtag-ui-front/src/views/Home/components/OperationDataCard.vue
new file mode 100644
index 0000000..e53def9
--- /dev/null
+++ b/hangtag-ui/hangtag-ui-front/src/views/Home/components/OperationDataCard.vue
@@ -0,0 +1,76 @@
+<template>
+  <el-card shadow="never">
+    <template #header>
+      <CardTitle title="运营数据" />
+    </template>
+    <div class="flex flex-row flex-wrap items-center gap-8 p-4">
+      <div
+        v-for="item in data"
+        :key="item.name"
+        class="h-20 w-20% flex flex-col cursor-pointer items-center justify-center gap-2"
+        @click="handleClick(item.routerName)"
+      >
+        <CountTo
+          :prefix="item.prefix"
+          :end-val="item.value"
+          :decimals="item.decimals"
+          class="text-3xl"
+        />
+        <span class="text-center">{{ item.name }}</span>
+      </div>
+    </div>
+  </el-card>
+</template>
+<script lang="ts" setup>
+import * as TradeStatisticsApi from '@/api/oms/statistics/trade'
+import { CardTitle } from '@/components/Card'
+
+/** 运营数据卡片 */
+defineOptions({ name: 'OperationDataCard' })
+
+const router = useRouter() // 路由
+
+/** 数据 */
+const data = reactive({
+  orderCountAA: { name: '已驳回订单', value: 0, routerName: 'SaleOrder' },
+  orderCountA: { name: '待提交订单', value: 0, routerName: 'SaleOrder' },
+  orderCountB: { name: '待审核订单', value: 0, routerName: 'SaleOrder' },
+  orderCountC: { name: '已完成订单', value: 0, routerName: 'SaleOrder' }
+})
+
+/** 查询订单数据 */
+const getOrderData = async () => {
+  const orderCount = await TradeStatisticsApi.getOrderCount()
+  if (orderCount.orderCountAA != null) {
+    data.orderCountAA.value = orderCount.orderCountAA
+  }
+  if (orderCount.orderCountA != null) {
+    data.orderCountA.value = orderCount.orderCountA
+  }
+  if (orderCount.orderCountB != null) {
+    data.orderCountB.value = orderCount.orderCountB
+  }
+  if (orderCount.orderCountC != null) {
+    data.orderCountC.value = orderCount.orderCountC
+  }
+}
+
+/**
+ * 跳转到对应页面
+ *
+ * @param routerName 路由页面组件的名称
+ */
+const handleClick = (routerName: string) => {
+  router.push({ name: routerName })
+}
+
+/** 激活时 */
+onActivated(() => {
+  getOrderData()
+})
+
+/** 初始化 **/
+onMounted(() => {
+  getOrderData()
+})
+</script>
diff --git a/hangtag-ui/hangtag-ui-front/src/views/Home/components/ShortcutCard.vue b/hangtag-ui/hangtag-ui-front/src/views/Home/components/ShortcutCard.vue
new file mode 100644
index 0000000..d1df1c9
--- /dev/null
+++ b/hangtag-ui/hangtag-ui-front/src/views/Home/components/ShortcutCard.vue
@@ -0,0 +1,51 @@
+<template>
+  <el-card shadow="never">
+    <template #header>
+      <CardTitle title="快捷入口" />
+    </template>
+    <div class="flex flex-row flex-wrap gap-8 p-4">
+      <div
+        v-for="menu in menuList"
+        :key="menu.name"
+        class="h-20 w-20% flex flex-col cursor-pointer items-center justify-center gap-2"
+        @click="handleMenuClick(menu.routerName)"
+      >
+        <div
+          :class="menu.bgColor"
+          class="h-48px w-48px flex items-center justify-center rounded text-white"
+        >
+          <Icon :icon="menu.icon" class="text-7.5!" />
+        </div>
+        <span>{{ menu.name }}</span>
+      </div>
+    </div>
+  </el-card>
+</template>
+<script lang="ts" setup>
+/** 快捷入口卡片 */
+import { CardTitle } from '@/components/Card'
+
+defineOptions({ name: 'ShortcutCard' })
+
+const router = useRouter() // 路由
+
+/** 菜单列表 */
+const menuList = [
+  { name: '订单管理', icon: 'ep:list', bgColor: 'bg-yellow-500', routerName: 'SaleOrder' },
+  {
+    name: '创建订单',
+    icon: 'fa-solid:project-diagram',
+    bgColor: 'bg-green-600',
+    routerName: 'CreateOrder'
+  }
+]
+
+/**
+ * 跳转到菜单对应页面
+ *
+ * @param routerName 路由页面组件的名称
+ */
+const handleMenuClick = (routerName: string) => {
+  router.push({ name: routerName })
+}
+</script>
diff --git a/hangtag-ui/hangtag-ui-front/src/views/Home/components/TradeTrendCard.vue b/hangtag-ui/hangtag-ui-front/src/views/Home/components/TradeTrendCard.vue
new file mode 100644
index 0000000..9cc96bb
--- /dev/null
+++ b/hangtag-ui/hangtag-ui-front/src/views/Home/components/TradeTrendCard.vue
@@ -0,0 +1,207 @@
+<template>
+  <el-card shadow="never">
+    <template #header>
+      <div class="flex flex-row items-center justify-between">
+        <CardTitle title="交易量趋势" />
+        <!-- 查询条件 -->
+        <div class="flex flex-row items-center gap-2">
+          <el-radio-group v-model="timeRangeType" @change="handleTimeRangeTypeChange">
+            <el-radio-button v-for="[key, value] in timeRange.entries()" :key="key" :label="key">
+              {{ value.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </div>
+      </div>
+    </template>
+    <!-- 折线图 -->
+    <Echart :height="300" :options="eChartOptions" />
+  </el-card>
+</template>
+<script lang="ts" setup>
+import dayjs, { Dayjs } from 'dayjs'
+import { EChartsOption } from 'echarts'
+import * as TradeStatisticsApi from '@/api/oms/statistics/trade'
+import { formatDate } from '@/utils/formatTime'
+import { CardTitle } from '@/components/Card'
+
+/** 交易量趋势 */
+defineOptions({ name: 'TradeTrendCard' })
+
+enum TimeRangeTypeEnum {
+  DAY30 = 1,
+  WEEK = 7,
+  MONTH = 30,
+  YEAR = 365
+} // 日期类型
+const timeRangeType = ref(TimeRangeTypeEnum.DAY30) // 日期快捷选择按钮, 默认30天
+const loading = ref(true) // 加载中
+// 时间范围 Map
+const timeRange = new Map()
+  .set(TimeRangeTypeEnum.DAY30, {
+    name: '30天',
+    series: [
+      { name: '订单金额', type: 'bar', smooth: true, data: [] },
+      { name: '订单数量', type: 'line', smooth: true, data: [] }
+    ]
+  })
+  .set(TimeRangeTypeEnum.WEEK, {
+    name: '周',
+    series: [
+      { name: '上周金额', type: 'bar', smooth: true, data: [] },
+      { name: '本周金额', type: 'bar', smooth: true, data: [] },
+      { name: '上周数量', type: 'line', smooth: true, data: [] },
+      { name: '本周数量', type: 'line', smooth: true, data: [] }
+    ]
+  })
+  .set(TimeRangeTypeEnum.MONTH, {
+    name: '月',
+    series: [
+      { name: '上月金额', type: 'bar', smooth: true, data: [] },
+      { name: '本月金额', type: 'bar', smooth: true, data: [] },
+      { name: '上月数量', type: 'line', smooth: true, data: [] },
+      { name: '本月数量', type: 'line', smooth: true, data: [] }
+    ]
+  })
+  .set(TimeRangeTypeEnum.YEAR, {
+    name: '年',
+    series: [
+      { name: '去年金额', type: 'bar', smooth: true, data: [] },
+      { name: '今年金额', type: 'bar', smooth: true, data: [] },
+      { name: '去年数量', type: 'line', smooth: true, data: [] },
+      { name: '今年数量', type: 'line', smooth: true, data: [] }
+    ]
+  })
+/** 图表配置 */
+const eChartOptions = reactive<EChartsOption>({
+  grid: {
+    left: 20,
+    right: 20,
+    bottom: 20,
+    top: 80,
+    containLabel: true
+  },
+  legend: {
+    top: 50,
+    data: []
+  },
+  series: [],
+  toolbox: {
+    feature: {
+      // 数据区域缩放
+      dataZoom: {
+        yAxisIndex: false // Y轴不缩放
+      },
+      brush: {
+        type: ['lineX', 'clear'] // 区域缩放按钮、还原按钮
+      },
+      saveAsImage: { show: true, name: '订单量趋势' } // 保存为图片
+    }
+  },
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: {
+      type: 'cross'
+    },
+    padding: [5, 10]
+  },
+  xAxis: {
+    type: 'category',
+    inverse: true,
+    boundaryGap: false,
+    axisTick: {
+      show: false
+    },
+    data: [],
+    axisLabel: {
+      formatter: (date: string) => {
+        switch (timeRangeType.value) {
+          case TimeRangeTypeEnum.DAY30:
+            return formatDate(date, 'MM-DD')
+          case TimeRangeTypeEnum.WEEK:
+            let weekDay = formatDate(date, 'ddd')
+            if (weekDay == '0') weekDay = '日'
+            return '周' + weekDay
+          case TimeRangeTypeEnum.MONTH:
+            return formatDate(date, 'D')
+          case TimeRangeTypeEnum.YEAR:
+            return formatDate(date, 'M') + '月'
+          default:
+            return date
+        }
+      }
+    }
+  },
+  yAxis: {
+    axisTick: {
+      show: false
+    }
+  }
+}) as EChartsOption
+
+/** 时间范围类型单选按钮选中 */
+const handleTimeRangeTypeChange = async () => {
+  // 设置时间范围
+  let beginTime: Dayjs
+  let endTime: Dayjs
+  switch (timeRangeType.value) {
+    case TimeRangeTypeEnum.WEEK:
+      beginTime = dayjs().startOf('week')
+      endTime = dayjs().endOf('week')
+      break
+    case TimeRangeTypeEnum.MONTH:
+      beginTime = dayjs().startOf('month')
+      endTime = dayjs().endOf('month')
+      break
+    case TimeRangeTypeEnum.YEAR:
+      beginTime = dayjs().startOf('year')
+      endTime = dayjs().endOf('year')
+      break
+    case TimeRangeTypeEnum.DAY30:
+    default:
+      beginTime = dayjs().subtract(30, 'day').startOf('d')
+      endTime = dayjs().endOf('d')
+      break
+  }
+  // 发送时间范围选中事件
+  await getOrderCountTrendComparison(beginTime, endTime)
+}
+
+/** 查询订单数量趋势对照数据 */
+const getOrderCountTrendComparison = async (
+  beginTime: dayjs.ConfigType,
+  endTime: dayjs.ConfigType
+) => {
+  loading.value = true
+  // 查询数据
+  const list = await TradeStatisticsApi.getOrderCountTrendComparison(
+    timeRangeType.value,
+    beginTime,
+    endTime
+  )
+  // 处理数据
+  const dates: string[] = []
+  const series = [...timeRange.get(timeRangeType.value).series]
+  for (let item of list) {
+    dates.push(item.value.date)
+    if (series.length === 2) {
+      series[0].data.push(item?.value?.orderAmount || 0) // 当前金额
+      series[1].data.push(item?.value?.orderCount || 0) // 当前数量
+    } else {
+      series[0].data.push(item?.reference?.orderAmount || 0) // 对照金额
+      series[1].data.push(item?.value?.orderAmount || 0) // 当前金额
+      series[2].data.push(item?.reference?.orderCount || 0) // 对照数量
+      series[3].data.push(item?.value?.orderCount || 0) // 当前数量
+    }
+  }
+  eChartOptions.xAxis!['data'] = dates
+  eChartOptions.series = series
+  // legend在4个切换到2个的时候，还是显示成4个，需要手动配置一下
+  eChartOptions.legend['data'] = series.map((item) => item.name)
+  loading.value = false
+}
+
+/** 初始化 **/
+onMounted(() => {
+  handleTimeRangeTypeChange()
+})
+</script>
diff --git a/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index222.vue b/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index222.vue
new file mode 100644
index 0000000..004062f
--- /dev/null
+++ b/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index222.vue
@@ -0,0 +1,392 @@
+<template>
+  <ContentWrap>
+    <el-row :gutter="10">
+      <el-form
+        ref="formRef"
+        :model="formData"
+        :rules="formRules"
+        label-width="150px"
+        v-loading="formLoading"
+      >
+        <div>
+        <el-card header="基本资料" style="width: 100%; margin-top: 20px" shadow="never"  class="box-card">
+          <template #header>
+            <CardTitle title="基本资料" />
+          </template>
+
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="订单号码" prop="orderNo">
+                  <el-input v-model="formData.orderNo" disabled="true" placeholder="*** New ***" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="订单状态" prop="orderstatus">
+                  <el-input v-model="formData.orderstatus" disabled="true" placeholder="INITIAL" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="用户名称" prop="username">
+                  <el-input v-model="formData.username" disabled="true" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="创建日期 (GMT+8)" prop="bizdate">
+                  <el-date-picker
+                    prefix-icon=""
+                    style="width: 760px"
+                    v-model="formData.bizdate"
+                    type="date"
+                    value-format="YYYY-MM-DD"
+                    disabled="true"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="客户号" prop="id">
+                  <el-input v-model="formData.id" disabled="true" placeholder="" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="企业公司" prop="company">
+                  <el-input v-model="formData.company" disabled="true" placeholder="" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="品牌" prop="brandId">
+                  <el-select v-model="formData.brandId" filterable placeholder="请选择品牌">
+                    <el-option
+                      v-for="brand in brandList"
+                      :key="brand.id"
+                      :label="brand.name"
+                      :value="brand.id"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="要求交货日期" prop="plansenddate">
+                  <el-date-picker
+                    style="width: 760px"
+                    v-model="formData.plansenddate"
+                    type="date"
+                    :size="size"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="联系人" prop="contacts">
+                  <el-input v-model="formData.contacts" placeholder="" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="手机" prop="phone">
+                  <el-input v-model="formData.phone" placeholder="" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="电话" prop="tel">
+                  <el-input v-model="formData.tel" placeholder="" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="传真" prop="fax">
+                  <el-input v-model="formData.fax" placeholder="" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="合同号" prop="contract">
+                  <el-input v-model="formData.contractNo" placeholder="" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="零售商单号" prop="retailerno">
+                  <el-input v-model="formData.retailerNo" placeholder="" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row>
+              <el-col>
+                <el-form-item label="备注" prop="remarks">
+                  <el-input  v-model="formData.remarks"
+                            :autosize="{ minRows: 4, maxRows: 6 }"
+                            type="textarea"
+                            placeholder="请输入备注" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+        </el-card>
+      <el-card header="电子邮件通知" style="width: 100%; margin-top: 20px" shadow="never">
+        <template #header>
+          <CardTitle title="电子邮件通知" />
+        </template>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="电子邮件" prop="newEmail">
+              <el-input v-model="formData.newEmail"  placeholder="" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" >
+            <div style="margin-left: 30px">
+              <el-button size="Default"  @click="onAddEmail">增加</el-button>
+              <el-button size="Default" @click="onDelEmail">删除</el-button>
+            </div>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="" prop="">
+              <div style="border: 1px solid #dcdfe6;width:100%;height: 200px;">
+                <el-scrollbar height="200px">
+                 <ul style="padding-left: 4px;margin-top: 4px;">
+                   <li style="list-style-type: none"  v-for="(item, index) in formData.newEmails" :key="index" @click="selectItem(index)"   :class="{'selected': selectedIndex === index}">
+                       {{ item }}
+                   </li>
+                 </ul>
+                </el-scrollbar>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-card>
+
+      <!-- 右上角：账户信息 -->
+      <el-col :span="12" class="detail-info-item" style="padding-left: 0px; margin-top: 20px">
+        <el-card shadow="never" class="h-full">
+          <template #header>
+            <CardTitle title="发票信息" />
+          </template>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="发票抬头" prop="invoiceCode">
+                <el-input v-model="formData.invoiceCode"  placeholder="请输入发票抬头" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="发票名称" prop="invoiceName">
+                <el-input v-model="formData.invoiceName" placeholder="请输入发票名称" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="发票地址" prop="invoiceAddress">
+                <el-input v-model="formData.invoiceAddress" placeholder="请输入发票地址" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="发票备注" prop="invoiceRemarks">
+                <el-input  v-model="formData.invoiceRemarks"
+                           :autosize="{ minRows: 4, maxRows: 6 }"
+                           type="textarea"
+                           placeholder="请输入发票备注" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-card>
+      </el-col>
+      <!-- 右上角：账户信息 -->
+<!--      <el-col :span="12" class="detail-info-item" style="padding-right: 0px; margin-top: 20px">
+        <el-card shadow="never" class="h-full">
+          <template #header>
+            <CardTitle title="送货信息" />
+          </template>
+          <el-form
+            ref="formRef"
+            :model="formData"
+            :rules="formRules"
+            label-width="150px"
+            v-loading="formLoading"
+          >
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="订单号码" prop="name">
+                  <el-input v-model="formData.name" disabled="true" placeholder="*** New ***" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="订单状态" prop="email">
+                  <el-input v-model="formData.email" placeholder="请输入邮箱" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col>
+                <el-form-item label="备注" prop="remarks">
+                  <el-input v-model="formData.remarks" placeholder="请输入备注" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-card>
+      </el-col>-->
+        </div>
+      </el-form>
+    </el-row>
+
+
+<!--    <el-affix position="bottom" :offset="20">
+      <el-row style="margin-top: 20px;border-top: #1e83e9" justify="end" >
+        <el-col :span="2">
+
+          <el-button type="primary" plain  size="mini" @click="openForm(undefined)">下一步</el-button>
+
+        </el-col>
+      </el-row>
+    </el-affix>
+    -->
+
+
+
+  </ContentWrap>
+
+  <!-- 固定在底部的行面板 -->
+  <el-affix position="bottom" :offset="20">
+    <div style="background-color: #909399; padding: 20px; text-align: right;">
+      <!-- 使用 el-row 和 el-col 来控制布局（虽然在这个简单场景下可能不是必需的） -->
+      <el-row>
+        <el-col :span="24">
+          <!-- 结算按钮 -->
+<!--          <el-button type="primary">结算</el-button>-->
+          <!-- 下一步按钮 -->
+          <el-button type="success" style="margin-left: 10px;">下一步</el-button>
+        </el-col>
+      </el-row>
+    </div>
+  </el-affix>
+</template>
+
+
+<script setup lang="ts">
+
+import {defaultProps} from "@/utils/tree";
+import * as BrandApi from "@/api/oms/brand";
+
+// 计算当前时间之后指定天数的日期
+const calculateDateAfterDays = (days) => {
+  const now = new Date();
+  now.setDate(now.getDate() + days);
+  // 转换为 'YYYY-MM-DD' 格式
+  return now.toISOString().split('T')[0];
+}
+
+const formRef = ref() // 表单 Ref
+
+const selectedIndex = ref(-1)
+
+const emails = ref([])
+
+
+
+const formData = ref({
+  name: undefined,
+  email: undefined,
+  contacts: undefined,
+  phone: undefined,
+  invoiceAddress: undefined,
+  areaId: undefined,
+  status: undefined,
+  type: undefined,
+  remarks: undefined,
+  orderNo: undefined,
+  invoiceName: undefined,
+  newEmail: '',
+  newEmails: [],
+  bizdate: new Date().toISOString(),
+  plansenddate: calculateDateAfterDays(7)
+})
+
+const formRules = reactive({
+  name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
+  brandId: [{ required: true, message: '品牌不能为空', trigger: 'blur' }],
+  phone: [{ required: true, message: '联系人手机号不能为空', trigger: 'blur' },
+    {
+      pattern: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,
+      message: '请输入正确的手机号码',
+      trigger: 'blur'
+    }
+  ],
+  email: [
+    {
+      type: 'email',
+      message: '请输入正确的邮箱地址',
+      trigger: ['blur', 'change']
+    }
+  ]
+})
+
+
+
+const onAddEmail = () => {
+  debugger;
+  if (formData.value.newEmail.trim() !== '') {
+    formData.value.newEmails.push(formData.value.newEmail);
+    formData.value.newEmail = ''; // 清空输入框
+  }
+}
+
+const selectItem = async (index:number) => {
+  selectedIndex.value = index;
+}
+
+const onDelEmail = () => {
+  if(selectedIndex.value>=0){
+    debugger;
+    formData.value.newEmails.splice(selectedIndex.value, 1); // 从数组中移除指定索引的元素
+    // 如果删除的是选中项，则清空选中项
+    if(selectedIndex.value === selectedIndex.value) {
+      selectedIndex.value = -1;
+    }
+  }
+  selectedIndex.value = -1;
+}
+
+/** 查询列表 */
+const getCustomer = async () => {
+  loading.value = true
+  try {
+    const data = await CustomerApi.getCustomerPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+
+/** 初始化 **/
+const brandList = ref<any[]>([]) // 品牌列表
+onMounted(async () => {
+  // 获取品牌列表
+  brandList.value = await BrandApi.getSimpleBrandList()
+})
+
+
+</script>
+
+
+<style scoped lang="scss">
+/* 为选中的行添加背景色 */
+.selected {
+  background-color: #dddee0; /* 浅绿色，可以根据需要调整 */
+}
+</style>
diff --git a/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/SaleOrderForm.vue b/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/SaleOrderForm.vue
new file mode 100644
index 0000000..c1b29d5
--- /dev/null
+++ b/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/SaleOrderForm.vue
@@ -0,0 +1,184 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="客户id" prop="customerId">
+        <el-input v-model="formData.customerId" placeholder="请输入客户id" />
+      </el-form-item>
+      <el-form-item label="业务日期" prop="bizdate">
+        <el-date-picker
+          v-model="formData.bizdate"
+          type="date"
+          value-format="x"
+          placeholder="选择业务日期"
+        />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
+      </el-form-item>
+      <el-form-item label="确认日期" prop="confirmdate">
+        <el-date-picker
+          v-model="formData.confirmdate"
+          type="date"
+          value-format="x"
+          placeholder="选择确认日期"
+        />
+      </el-form-item>
+      <el-form-item label="计划日期" prop="plansenddate">
+        <el-date-picker
+          v-model="formData.plansenddate"
+          type="date"
+          value-format="x"
+          placeholder="选择计划日期"
+        />
+      </el-form-item>
+      <el-form-item label="手机" prop="phone">
+        <el-input v-model="formData.phone" placeholder="请输入手机" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remarks">
+        <el-input v-model="formData.remarks" placeholder="请输入备注" />
+      </el-form-item>
+      <el-form-item label="邮件列表，数据格式：xxx@xx.com;xxx@xx.com;" prop="emails">
+        <el-input v-model="formData.emails" placeholder="请输入邮件列表，数据格式：xxx@xx.com;xxx@xx.com;" />
+      </el-form-item>
+      <el-form-item label="发票抬头" prop="invoiceCode">
+        <el-input v-model="formData.invoiceCode" placeholder="请输入发票抬头" />
+      </el-form-item>
+      <el-form-item label="发票名称" prop="invoiceName">
+        <el-input v-model="formData.invoiceName" placeholder="请输入发票名称" />
+      </el-form-item>
+      <el-form-item label="地址" prop="address">
+        <el-input v-model="formData.address" placeholder="请输入地址" />
+      </el-form-item>
+      <el-form-item label="货币" prop="currency">
+        <el-input v-model="formData.currency" placeholder="请输入货币" />
+      </el-form-item>
+      <el-form-item label="发票备注" prop="invoiceRemarks">
+        <el-input v-model="formData.invoiceRemarks" placeholder="请输入发票备注" />
+      </el-form-item>
+    </el-form>
+    <!-- 子表的表单 -->
+    <el-tabs v-model="subTabsName">
+      <el-tab-pane label="销售订单明细" name="saleOrderEntry">
+        <SaleOrderEntryForm ref="saleOrderEntryFormRef" :parent-id="formData.id" />
+      </el-tab-pane>
+    </el-tabs>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { SaleOrderApi, SaleOrderVO } from '@/api/oms/saleorder'
+import SaleOrderEntryForm from './components/SaleOrderEntryForm.vue'
+
+/** 销售订单 表单 */
+defineOptions({ name: 'SaleOrderForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  customerId: undefined,
+  bizdate: undefined,
+  remark: undefined,
+  confirmdate: undefined,
+  plansenddate: undefined,
+  phone: undefined,
+  remarks: undefined,
+  emails: undefined,
+  invoiceCode: undefined,
+  invoiceName: undefined,
+  address: undefined,
+  currency: undefined,
+  invoiceRemarks: undefined,
+})
+const formRules = reactive({
+})
+const formRef = ref() // 表单 Ref
+
+/** 子表的表单 */
+const subTabsName = ref('saleOrderEntry')
+const saleOrderEntryFormRef = ref()
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await SaleOrderApi.getSaleOrder(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 校验子表单
+  try {
+    await saleOrderEntryFormRef.value.validate()
+  } catch (e) {
+    subTabsName.value = 'saleOrderEntry'
+    return
+  }
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as SaleOrderVO
+    // 拼接子表的数据
+    data.saleOrderEntrys = saleOrderEntryFormRef.value.getData()
+    if (formType.value === 'create') {
+      await SaleOrderApi.createSaleOrder(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await SaleOrderApi.updateSaleOrder(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    customerId: undefined,
+    bizdate: undefined,
+    remark: undefined,
+    confirmdate: undefined,
+    plansenddate: undefined,
+    phone: undefined,
+    remarks: undefined,
+    emails: undefined,
+    invoiceCode: undefined,
+    invoiceName: undefined,
+    address: undefined,
+    currency: undefined,
+    invoiceRemarks: undefined,
+  }
+  formRef.value?.resetFields()
+}
+</script>
\ No newline at end of file
diff --git a/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/components/SaleOrderEntryForm.vue b/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/components/SaleOrderEntryForm.vue
new file mode 100644
index 0000000..4de7fb0
--- /dev/null
+++ b/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/components/SaleOrderEntryForm.vue
@@ -0,0 +1,121 @@
+<template>
+  <el-form
+    ref="formRef"
+    :model="formData"
+    :rules="formRules"
+    v-loading="formLoading"
+    label-width="0px"
+    :inline-message="true"
+  >
+    <el-table :data="formData" class="-mt-10px">
+      <el-table-column label="序号" type="index" width="100" />
+       <el-table-column label="物料id" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.materialId`" :rules="formRules.materialId" class="mb-0px!">
+            <el-input v-model="row.materialId" placeholder="请输入物料id" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="物料名称" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.materialName`" :rules="formRules.materialName" class="mb-0px!">
+            <el-input v-model="row.materialName" placeholder="请输入物料名称" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="物料规格" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.materialSpec`" :rules="formRules.materialSpec" class="mb-0px!">
+            <el-input v-model="row.materialSpec" placeholder="请输入物料规格" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="单价" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.price`" :rules="formRules.price" class="mb-0px!">
+            <el-input v-model="row.price" placeholder="请输入单价" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="数量" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.qty`" :rules="formRules.qty" class="mb-0px!">
+            <el-input v-model="row.qty" placeholder="请输入数量" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" fixed="right" label="操作" width="60">
+        <template #default="{ $index }">
+          <el-button @click="handleDelete($index)" link>—</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </el-form>
+  <el-row justify="center" class="mt-3">
+    <el-button @click="handleAdd" round>+ 添加销售订单明细</el-button>
+  </el-row>
+</template>
+<script setup lang="ts">
+import { SaleOrderApi } from '@/api/oms/saleorder'
+
+const props = defineProps<{
+  parentId: undefined // 主表id（主表的关联字段）
+}>()
+const formLoading = ref(false) // 表单的加载中
+const formData = ref([])
+const formRules = reactive({
+})
+const formRef = ref() // 表单 Ref
+
+/** 监听主表的关联字段的变化，加载对应的子表数据 */
+watch(
+  () => props.parentId,
+  async (val) => {
+    // 1. 重置表单
+    formData.value = []
+    // 2. val 非空，则加载数据
+    if (!val) {
+      return;
+    }
+    try {
+      formLoading.value = true
+      formData.value = await SaleOrderApi.getSaleOrderEntryListByParentId(val)
+    } finally {
+      formLoading.value = false
+    }
+  },
+  { immediate: true }
+)
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  const row = {
+    id: undefined,
+    parentId: undefined,
+    materialId: undefined,
+    materialName: undefined,
+    materialSpec: undefined,
+    price: undefined,
+    qty: undefined,
+  }
+  row.parentId = props.parentId
+  formData.value.push(row)
+}
+
+/** 删除按钮操作 */
+const handleDelete = (index) => {
+  formData.value.splice(index, 1)
+}
+
+/** 表单校验 */
+const validate = () => {
+  return formRef.value.validate()
+}
+
+/** 表单值 */
+const getData = () => {
+  return formData.value
+}
+
+defineExpose({ validate, getData })
+</script>
\ No newline at end of file
diff --git a/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/components/SaleOrderEntryList.vue b/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/components/SaleOrderEntryList.vue
new file mode 100644
index 0000000..7b47eec
--- /dev/null
+++ b/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/components/SaleOrderEntryList.vue
@@ -0,0 +1,123 @@
+<template>
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-button
+      type="primary"
+      plain
+      @click="openForm('create')"
+      v-hasPermi="['oms:sale-order:create']"
+    >
+      <Icon icon="ep:plus" class="mr-5px" /> 新增
+    </el-button>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="ID" align="center" prop="id" />
+       <el-table-column label="物料id" align="center" prop="materialId" />
+      <el-table-column label="物料名称" align="center" prop="materialName" />
+      <el-table-column label="物料规格" align="center" prop="materialSpec" />
+      <el-table-column label="单价" align="center" prop="price" />
+      <el-table-column label="数量" align="center" prop="qty" />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['oms:sale-order:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['oms:sale-order:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+    <!-- 表单弹窗：添加/修改 -->
+    <SaleOrderEntryForm ref="formRef" @success="getList" />
+</template>
+<script setup lang="ts">
+import { SaleOrderApi } from '@/api/oms/saleorder'
+import SaleOrderEntryForm from './SaleOrderEntryForm.vue'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const props = defineProps<{
+  parentId?: number // 主表id（主表的关联字段）
+}>()
+const loading = ref(false) // 列表的加载中
+const list = ref([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  parentId: undefined as unknown
+})
+
+/** 监听主表的关联字段的变化，加载对应的子表数据 */
+watch(
+  () => props.parentId,
+  (val: number) => {
+    if (!val) {
+      return
+    }
+    queryParams.parentId = val
+    handleQuery()
+  },
+    { immediate: true, deep: true }
+)
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await SaleOrderApi.getSaleOrderEntryPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  if (!props.parentId) {
+    message.error('请选择一个OMS销售订单主表')
+    return
+  }
+  formRef.value.open(type, id, props.parentId)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await SaleOrderApi.deleteSaleOrderEntry(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+</script>
\ No newline at end of file
diff --git a/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/detail/index.vue b/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/detail/index.vue
new file mode 100644
index 0000000..5b643d1
--- /dev/null
+++ b/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/detail/index.vue
@@ -0,0 +1,357 @@
+<template>
+  <ContentWrap>
+    <el-button
+      v-if="formData.billStatus != 'C'"
+      type="primary"
+      @click="handleSave"
+    >保存</el-button>
+    <el-button
+      v-if="formData.billStatus == 'B'"
+      type="primary"
+      @click="handleAudit"
+    >审核</el-button>
+    <el-button
+      v-if="formData.billStatus == 'A' || formData.billStatus == 'B' "
+      type="primary"
+      @click="remark">备注</el-button>
+    <!-- 订单信息 -->
+    <el-descriptions title="订单信息">
+      <el-descriptions-item label="订单号: ">{{ formData.billno }}</el-descriptions-item>
+      <el-descriptions-item label="业务日期: ">{{ formatDate(formData.bizdate,'YYYY-MM-DD') }}</el-descriptions-item>
+      <el-descriptions-item label="确认日期: ">{{ formatDate(formData.confirmdate,'YYYY-MM-DD') }}</el-descriptions-item>
+      <el-descriptions-item label="计划日期: ">{{ formatDate(formData.plansenddate,'YYYY-MM-DD') }}</el-descriptions-item>
+      <el-descriptions-item label="手机: ">{{ formData.phone }}</el-descriptions-item>
+      <el-descriptions-item label="传真: ">{{ formData.fax }}</el-descriptions-item>
+      <el-descriptions-item label="邮件: ">{{ formData.emails }}</el-descriptions-item>
+      <el-descriptions-item label="客户编号: ">{{ formData?.customer?.number }}</el-descriptions-item>
+      <el-descriptions-item label="客户名称: ">{{ formData?.customer?.name }}</el-descriptions-item>
+      <el-descriptions-item label="客户公司: ">{{ formData?.customer?.company }}</el-descriptions-item>
+      <el-descriptions-item label="订单备注: ">{{ formData.remark }}</el-descriptions-item>
+    </el-descriptions>
+
+    <!-- 订单状态 -->
+    <el-descriptions :column="3" title="订单状态">
+      <el-descriptions-item label="单据状态: ">
+        <dict-tag :type="DICT_TYPE.OMS_BILL_STATUS" :value="formData.billStatus" />
+      </el-descriptions-item>
+      <el-descriptions-item label="订单状态: ">
+        <dict-tag :type="DICT_TYPE.OMS_ORDER_STATUS" :value="formData.orderStatus" />
+      </el-descriptions-item>
+      <el-descriptions-item v-if="formData.billStatus == 'AA' " label="驳回原因: ">{{ formData?.rejectReason }}</el-descriptions-item>
+      <el-descriptions-item v-hasPermi="['oms:sale-order:update']" label-class-name="no-colon">
+        <!-- 待发货 -->
+        <template >
+          <!-- 快递发货 -->
+          <el-button
+            type="primary"
+            @click="delivery"
+          >
+            发货
+          </el-button>
+          <el-button
+            type="primary"
+            @click="updateAddress"
+          >
+            修改地址
+          </el-button>
+          <!-- 到店自提 -->
+          <el-button
+            type="primary"
+            @click="handleAudit"
+          >
+            核销
+          </el-button>
+        </template>
+      </el-descriptions-item>
+<!--      <el-descriptions-item>
+        <template #label><span style="color: red">提醒: </span></template>
+        买家付款成功后，货款将直接进入您的商户号（微信、支付宝）<br />
+        请及时关注你发出的包裹状态，确保可以配送至买家手中 <br />
+        如果买家表示没收到货或货物有问题，请及时联系买家处理，友好协商
+      </el-descriptions-item>-->
+    </el-descriptions>
+
+
+    <!-- 商品信息 -->
+    <el-descriptions title="产品信息">
+      <el-descriptions-item labelClassName="no-colon">
+        <el-row :gutter="20">
+          <el-col :span="544">
+            <el-form
+              ref="itemFormEntrysRef"
+              :model="formData.entrys"
+              :rules="itemFormEntrysRules"
+              label-width="0px"
+              :inline-message="true"
+            >
+            <el-table :data="formData.entrys"
+                      border
+                      :on-cell-click="cellClick"
+
+            >
+
+              <el-table-column label="产品编码" prop="materialName" width="150"/>
+              <el-table-column label="产品名称" prop="materialName" width="150"/>
+              <el-table-column label="产品规格" prop="materialSpec" width="150" />
+              <el-table-column label="数量" prop="qty" width="150" />
+              <el-table-column label="单价" width="250">
+                <template #default="{ row, $index }">
+                  <el-form-item  :prop="`${$index}.price`" :rules="itemFormEntrysRules.price" class="mb-0px!"
+                      v-if="row.billStatus!='C'"
+                  >
+                  <el-input-number
+                    style="width: 100%"
+                    v-model.number="row.price"
+                    :step="0.001"
+                    :controls="false"
+                    @change="changeRow(row,'price')"
+                    placeholder="请输入单价"
+                  />
+                  </el-form-item>
+                  <span v-else @click="editRow($index)">{{ row.price }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="折扣(%)" prop="discount" width="250" >
+                <template #default="{ row, $index }">
+                  <el-input-number
+                    style="width: 100%"
+                    v-if="row.billStatus!='C'"
+                    v-model.number="row.discount"
+                    :step="0.001"
+                    :controls="false"
+                    min="0"
+                    max="100"
+                    @change="changeRow(row,'discount')"
+                    placeholder="请输入折扣(%)"
+                  />
+                  <span v-else @click="editRow($index)">{{ row.discount }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="金额" prop="amount" width="250" />
+<!--              <el-table-column label="合计" prop="payPrice" width="150">
+                <template #default="{ row }">{{ fenToYuan(row.payPrice) }}元</template>
+              </el-table-column>-->
+            </el-table>
+            </el-form>
+          </el-col>
+          <el-col :span="10" />
+        </el-row>
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <!-- 订单信息 -->
+    <el-descriptions title="发票信息">
+      <el-descriptions-item label="发票抬头: ">{{ formData.invoiceCode }}</el-descriptions-item>
+      <el-descriptions-item label="发票名称: ">{{ formData.invoiceName }}</el-descriptions-item>
+      <el-descriptions-item label="货币: ">{{ formData.currency }}</el-descriptions-item>
+      <el-descriptions-item label="发票备注: ">{{ formData.invoiceRemarks }}</el-descriptions-item>
+    </el-descriptions>
+
+
+
+    <!-- 订单信息 -->
+    <el-descriptions title="制单信息">
+      <el-descriptions-item label="创建时间: ">{{ formatDate(formData.createTime) }}</el-descriptions-item>
+      <el-descriptions-item label="修改人: ">{{ formData.updaterName }}</el-descriptions-item>
+      <el-descriptions-item label="修改时间: ">{{ formatDate(formData.updateTime) }}</el-descriptions-item>
+      <el-descriptions-item label="审核人: ">{{ formData.auditorName }}</el-descriptions-item>
+      <el-descriptions-item label="审核时间: ">{{ formatDate(formData.auditorTime) }}</el-descriptions-item>
+    </el-descriptions>
+  </ContentWrap>
+
+  <!-- 各种操作的弹窗 -->
+  <OrderUpdateRemarkForm ref="updateRemarkForm" @success="getDetail" />
+  <OrderUpdateAddressForm ref="updateAddressFormRef" @success="getDetail" />
+</template>
+<script lang="ts" setup>
+import { fenToYuan } from '@/utils'
+import { DICT_TYPE, getDictLabel, getDictObj } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
+import OrderUpdateRemarkForm from '@/views/oms/saleorder/form/OrderUpdateRemarkForm.vue'
+import OrderUpdateAddressForm from '@/views/oms/saleorder/form/OrderUpdateAddressForm.vue'
+import { useTagsViewStore } from '@/store/modules/tagsView'
+import { propTypes } from '@/utils/propTypes'
+import {SaleOrderApi, SaleOrderVO} from "@/api/oms/saleorder";
+
+defineOptions({ name: 'TradeOrderDetail' })
+
+const message = useMessage() // 消息弹窗
+
+
+
+const itemFormEntrysRef = ref() // 表单 Ref
+
+const itemFormEntrysRules = reactive({
+  price: [{ required: true, message: '单价不能为空', trigger: 'blur' }],
+})
+
+// 订单详情
+const formData = ref<SaleOrderVO>({
+  logs: []
+})
+
+/** 各种操作 */
+const updateRemarkForm = ref() // 订单备注表单 Ref
+const remark = () => {
+  updateRemarkForm.value?.open(formData.value)
+}
+
+const updateAddressFormRef = ref() // 收货地址表单 Ref
+const updateAddress = () => {
+  updateAddressFormRef.value?.open(formData.value)
+}
+
+
+
+
+
+
+const changeRow = async (row,key:string) => {
+  if('price' == key || 'discount' == key ){
+    let price = row.price
+    let qty = row.qty
+    let discount = row.discount
+    row.amount = (price*qty) * (1-(discount/100))
+    //100*(1-(2/100))
+  }
+}
+const handleSave = async () => {
+  try {
+    // 校验表单
+    await itemFormEntrysRef.value.validate()
+    // 提交
+    await SaleOrderApi.updateOrderEntrys(formData.value)
+    message.success('保存成功')
+    // 刷新列表
+    await getDetail()
+  } catch {}
+}
+
+/** 审核 */
+const handleAudit = async () => {
+  try {
+    // 校验表单
+    await itemFormEntrysRef.value.validate()
+    // 二次确认
+    await message.confirm('确认审核订单吗？')
+    // 提交
+    await SaleOrderApi.updateSaleOrderBillStatus([formData.value.id],'audit')
+    message.success('审核成功')
+    // 刷新列表
+    await getDetail()
+  } catch {}
+}
+
+/** 获得详情 */
+const { params } = useRoute() // 查询参数
+const props = defineProps({
+  id: propTypes.number.def(undefined), // 订单ID
+  showPickUp: propTypes.bool.def(true) // 显示核销按钮
+})
+const id = (params.id || props.id) as unknown as number
+const getDetail = async () => {
+  if (id) {
+    const res = (await SaleOrderApi.getSaleOrder(id)) as SaleOrderVO
+    // 没有表单信息则关闭页面返回
+    if (!res) {
+      message.error('销售订单不存在')
+      close()
+    }
+    formData.value = res
+  }
+}
+
+
+/** 关闭 tag */
+const { delView } = useTagsViewStore() // 视图操作
+const { push, currentRoute } = useRouter() // 路由
+const close = () => {
+  delView(unref(currentRoute))
+  push({ name: 'SaleOrder' })
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  await getDetail()
+})
+</script>
+<style lang="scss" scoped>
+:deep(.el-descriptions) {
+  &:not(:nth-child(1)) {
+    margin-top: 20px;
+  }
+
+  .el-descriptions__title {
+    display: flex;
+    align-items: center;
+
+    &::before {
+      display: inline-block;
+      width: 3px;
+      height: 20px;
+      margin-right: 10px;
+      background-color: #409eff;
+      content: '';
+    }
+  }
+
+  .el-descriptions-item__container {
+    margin: 0 10px;
+
+    .no-colon {
+      margin: 0;
+
+      &::after {
+        content: '';
+      }
+    }
+  }
+}
+
+// 时间线样式调整
+:deep(.el-timeline) {
+  margin: 10px 0 0 160px;
+
+  .el-timeline-item__wrapper {
+    position: relative;
+    top: -20px;
+
+    .el-timeline-item__timestamp {
+      position: absolute !important;
+      top: 10px;
+      left: -150px;
+    }
+  }
+
+  .el-timeline-right-content {
+    display: flex;
+    align-items: center;
+    min-height: 30px;
+    padding: 10px;
+    background-color: #f7f8fa;
+
+    &::before {
+      position: absolute;
+      top: 10px;
+      left: 13px; /* 将伪元素水平居中 */
+      border-color: transparent #f7f8fa transparent transparent; /* 尖角颜色，左侧朝向 */
+      border-style: solid;
+      border-width: 8px; /* 调整尖角大小 */
+      content: ''; /* 必须设置 content 属性 */
+    }
+  }
+
+  .dot-node-style {
+    position: absolute;
+    left: -5px;
+    display: flex;
+    width: 20px;
+    height: 20px;
+    font-size: 10px;
+    color: #fff;
+    border-radius: 50%;
+    justify-content: center;
+    align-items: center;
+  }
+}
+</style>
diff --git a/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/form/OrderUpdateAddressForm.vue b/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/form/OrderUpdateAddressForm.vue
new file mode 100644
index 0000000..77cccdb
--- /dev/null
+++ b/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/form/OrderUpdateAddressForm.vue
@@ -0,0 +1,98 @@
+<template>
+  <Dialog v-model="dialogVisible" title="修改订单收货地址" width="35%">
+    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="120px">
+      <el-form-item label="收件人">
+        <el-input v-model="formData.receiverName" placeholder="请输入收件人名称" />
+      </el-form-item>
+      <el-form-item label="手机号">
+        <el-input v-model="formData.receiverMobile" placeholder="请输入收件人手机号" />
+      </el-form-item>
+      <el-form-item label="所在地">
+        <el-tree-select
+          v-model="formData.receiverAreaId"
+          :data="areaList"
+          :props="defaultProps"
+          :render-after-expand="true"
+        />
+      </el-form-item>
+      <el-form-item label="详细地址">
+        <el-input
+          v-model="formData.receiverDetailAddress"
+          :rows="3"
+          placeholder="请输入收件人详细地址"
+          type="textarea"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { getAreaTree } from '@/api/system/area'
+import { copyValueToTarget } from '@/utils'
+import { defaultProps } from '@/utils/tree'
+import {SaleOrderApi,SaleOrderVO} from "@/api/oms/saleorder";
+
+defineOptions({ name: 'OrderUpdateAddressForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  id: undefined, // 订单编号
+  receiverName: '', // 收件人名称
+  receiverMobile: '', // 收件人手机
+  receiverAreaId: null, //收件人地区编号
+  receiverDetailAddress: '' //收件人详细地址
+})
+const areaList = ref([]) // 地区列表
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (row: SaleOrderVO) => {
+  resetForm()
+  // 设置数据
+  copyValueToTarget(formData.value, row)
+  dialogVisible.value = true
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = unref(formData)
+    await SaleOrderApi.updateOrderAddress(data)
+    message.success(t('common.updateSuccess'))
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success', true)
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined, // 订单编号
+    receiverName: '', // 收件人名称
+    receiverMobile: '', // 收件人手机
+    receiverAreaId: null, //收件人地区编号
+    receiverDetailAddress: '' //收件人详细地址
+  }
+  formRef.value?.resetFields()
+}
+
+onMounted(async () => {
+  // 获得地区列表
+  areaList.value = await getAreaTree()
+})
+</script>
diff --git a/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/form/OrderUpdateRemarkForm.vue b/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/form/OrderUpdateRemarkForm.vue
new file mode 100644
index 0000000..ca2ff94
--- /dev/null
+++ b/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/form/OrderUpdateRemarkForm.vue
@@ -0,0 +1,70 @@
+<template>
+  <Dialog v-model="dialogVisible" title="订单备注" width="45%">
+    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
+      <el-form-item label="备注">
+        <el-input
+          v-model="formData.remark"
+          :rows="3"
+          placeholder="请输入订单备注"
+          type="textarea"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import {SaleOrderApi,SaleOrderVO} from "@/api/oms/saleorder";
+
+defineOptions({ name: 'OrderUpdateRemarkForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  id: undefined, // 订单编号
+  remark: '' // 订单备注
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (row: SaleOrderVO) => {
+  resetForm()
+  // 设置数据
+  formData.value.id = row.id
+  formData.value.remark = row.remark
+  dialogVisible.value = true
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = unref(formData)
+    await SaleOrderApi.updateOrderRemark(data)
+    message.success(t('common.updateSuccess'))
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success', true)
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined, // 订单编号
+    remark: '' // 订单备注
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/index.vue b/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/index.vue
new file mode 100644
index 0000000..6946f2f
--- /dev/null
+++ b/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/index.vue
@@ -0,0 +1,589 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb1px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="单据编号" prop="billno">
+        <el-input
+          v-model="queryParams.billno"
+          placeholder="请输入单据编号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="客户" prop="customerId">
+        <el-input
+          v-model="queryParams.customerId"
+          placeholder="请输入客户"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="业务日期" prop="bizdate">
+        <el-date-picker
+          v-model="queryParams.bizdate"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="确认日期" prop="confirmdate">
+        <el-date-picker
+          v-model="queryParams.confirmdate"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="计划日期" prop="plansenddate">
+        <el-date-picker
+          v-model="queryParams.plansenddate"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="单据状态" prop="billStatus">
+        <el-select
+          v-model="queryParams.billStatus"
+          placeholder="请选择单据状态"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.OMS_BILL_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="订单状态" prop="orderStatus">
+        <el-select
+          v-model="queryParams.orderStatus"
+          placeholder="请选择订单状态"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.OMS_ORDER_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="手机" prop="phone">
+        <el-input
+          v-model="queryParams.phone"
+          placeholder="请输入手机"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="备注" prop="remarks">
+        <el-input
+          v-model="queryParams.remarks"
+          placeholder="请输入备注"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="-mb-1px">
+      <el-col :span="1.5">
+<!--        <el-button
+          type="danger"
+          plain
+          @click="handleReject()"
+          :disabled="selectionList.length === 0"
+        >驳回
+        </el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="handleUpdateBillStatus('invalid')"
+          :disabled="selectionList.length === 0"
+        >
+          作废
+        </el-button>
+        <el-button
+          type="warning"
+          plain
+          @click="handleUpdateBillStatus('submit')"
+          :disabled="selectionList.length === 0"
+        >提交
+        </el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="handleUpdateBillStatus('audit')"
+          :disabled="selectionList.length === 0"
+        >
+          审核
+        </el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="generateProduceOrder()"
+          :disabled="selectionList.length === 0 || queryParams.tabType === 0"
+        >
+          生成制单
+        </el-button>-->
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-col>
+    </el-row>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-tabs v-model="queryParams.tabType" @tab-click="handleTabClick">
+      <el-tab-pane
+        v-for="item in tabsData"
+        :key="item.type"
+        :label="item.name + '(' + item.count + ')'"
+        :name="item.type"
+      />
+    </el-tabs>
+    <el-table v-loading="loading" :data="list" :stripe="true"
+              :show-overflow-tooltip="true"
+              @selection-change="handleSelectionChange"
+              :row-class-name="tableRowClassName"
+    >
+      <el-table-column width="30" label="选择" type="selection" />
+      <el-table-column label="单据编号" align="center" prop="billno"     width="120px"/>
+      <el-table-column label="客户" align="center" prop="customerId"     width="120px"/>
+      <el-table-column label="销售员" align="center" prop="customerId"   width="180px"/>
+      <el-table-column label="跟单员" align="center" prop="customerId"   width="180px"/>
+      <el-table-column label="单据状态" align="center" prop="billStatus" width="180px">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.OMS_BILL_STATUS" :value="scope.row.billStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column label="订单状态" align="center" prop="orderStatus" width="180px">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.OMS_ORDER_STATUS" :value="scope.row.orderStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="业务日期"
+        align="center"
+        prop="bizdate"
+        :formatter="dateFormatter2"
+        width="180px"
+      />
+      <el-table-column
+        label="确认日期"
+        align="center"
+        prop="confirmdate"
+        :formatter="dateFormatter2"
+        width="180px"
+      />
+      <el-table-column
+        label="计划日期"
+        align="center"
+        prop="plansenddate"
+        :formatter="dateFormatter2"
+        width="180px"
+      />
+      <el-table-column label="手机" align="center" prop="phone" />
+      <el-table-column label="备注" align="center" prop="remarks" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column
+        label="更新时间"
+        align="center"
+        prop="updateTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center" width="150" fixed="right">
+        <template #default="scope">
+          <el-button
+            v-hasPermi="['oms:sale-order:query']"
+            link
+            type="primary"
+            @click="openDetail(scope.row.id)"
+          >
+            <Icon icon="ep:notification" />
+            详情
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['oms:sale-order:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <SaleOrderForm ref="formRef" @success="getList" />
+
+
+
+  <!-- 驳回对话框 -->
+  <el-dialog :title="rejectTitle" v-model="rejectOpen" width="750px" style="height: 210px;" append-to-body>
+    <el-form ref="form" :model="rejectform"  label-width="80px" >
+      <el-form-item label="驳回原因" prop="rejectReason" >
+        <el-input v-model="rejectform.rejectReason"  :rows="3" type="textarea" placeholder="请输入驳回原因" />
+      </el-form-item>
+    </el-form>
+    <div class="dialog-footer" style="text-align: right">
+      <el-button type="primary" @click="submitRejectForm">确 定</el-button>
+      <el-button @click="rejectCancel">取 消</el-button>
+    </div>
+  </el-dialog>
+
+</template>
+
+<script setup lang="ts">
+import { getIntDictOptions, getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+import {dateFormatter, dateFormatter2} from '@/utils/formatTime'
+import download from '@/utils/download'
+import { SaleOrderApi, SaleOrderVO } from '@/api/oms/saleorder'
+import SaleOrderForm from './SaleOrderForm.vue'
+import {checkPermi} from "@/utils/permission";
+
+/** 销售订单 列表 */
+defineOptions({ name: 'SaleOrder' })
+
+const { currentRoute, push } = useRouter() // 路由跳转
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<SaleOrderVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+
+
+// tabs 数据
+const tabsData = ref([
+  {
+    name: '已下单',
+    type: 0,
+    count: 0
+  },
+  {
+    name: '生产中',
+    type: 1,
+    count: 0
+  },
+  {
+    name: '已完成',
+    type: 2,
+    count: 0
+  }
+])
+
+
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  billno: undefined,
+  customerId: undefined,
+  tabType: 0,
+  bizdate: [],
+  confirmdate: [],
+  plansenddate: [],
+  phone: undefined,
+  remarks: undefined,
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+
+//驳回参数
+const rejectOpen = ref(false)
+const rejectTitle = ref('')
+const rejectform = reactive({
+  rejectReason: undefined
+})
+
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await SaleOrderApi.getSaleOrderPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+
+/** 获得每个 Tab 的数量 */
+const getTabsCount = async () => {
+  const res = await SaleOrderApi.getTabsCount()
+  for (let objName in res) {
+    tabsData.value[Number(objName)].count = res[objName]
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    debugger;
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await SaleOrderApi.deleteSaleOrder(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+
+/** 驳回操作 */
+const handleReject = async () => {
+  const ids = selectionList.value.map((item) => item.id)
+  const billStatus = selectionList.value.map((item) => item.billStatus)
+  debugger
+  for(let vals of billStatus) {
+    if(vals!='A' && vals!='B'){
+      message.error("请选择单据状态保存或已提交的数据行");
+      return;
+    }
+  }
+  rejectform.rejectReason = undefined
+  rejectTitle.value = "是否驳回选中的数据项?"
+  rejectOpen.value = true
+}
+/** 审批操作 */
+const handleUpdateBillStatus = async (operateKey: string) => {
+  try {
+    const ids = selectionList.value.map((item) => item.id)
+    const billStatus = selectionList.value.map((item) => item.billStatus)
+    for(let vals of billStatus) {
+        if("audit" == operateKey && vals!='B'){
+          message.error("请选择单据状态已提交的数据行");
+          return;
+        }
+        if("invalid" == operateKey && (vals=='C')){
+          debugger
+          message.error("单据已审核不允许作废");
+          return;
+        }
+    }
+    debugger
+    // 审批的二次确认
+    let operateName = ''
+    if(operateKey === 'submit'){
+      operateName = '提交'
+    }else if(operateKey === "audit"){
+      operateName = '审核'
+    }else if(operateKey === "invalid"){
+      operateName = '作废'
+    }else {
+      return
+    }
+    await message.confirm(`确定${operateName}该订单吗？`)
+    // 发起审批
+    await SaleOrderApi.updateSaleOrderBillStatus(ids, operateKey)
+    message.success(`${operateName}成功`)
+    // 刷新列表
+    await getList()
+    selectionList.value = selectionList.value.filter((item) => !ids.includes(item.id))
+  } catch {}
+}
+
+
+/** 审批/反审批操作 */
+const generateProduceOrder = async () => {
+  try {
+    const ids = selectionList.value.map((item) => item.id)
+    const billStatus = selectionList.value.map((item) => item.billStatus)
+    for(let vals of billStatus) {
+      if(vals!='C'){
+        message.error("请选择单据状态已审核的数据行");
+        return;
+      }
+    }
+
+    // 审批的二次确认
+    await message.confirm(`是否生成生产制单？`)
+    // 发起审批
+    await SaleOrderApi.generateProduceOrder(ids)
+    message.success(`生成成功！`)
+    // 刷新列表
+    await getList()
+    selectionList.value = selectionList.value.filter((item) => !ids.includes(item.id))
+  } catch {}
+}
+
+
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SaleOrderApi.exportSaleOrder(queryParams)
+    download.excel(data, '销售订单.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+
+/** 切换 Tab */
+const handleTabClick = (tab: TabsPaneContext) => {
+  queryParams.tabType = tab.paneName as number
+  getList()
+}
+
+/** 选中操作 */
+const selectionList = ref<SaleOrderVO[]>([])
+const handleSelectionChange = (rows: SaleOrderVO[]) => {
+  selectionList.value = rows
+}
+
+
+/** 驳回提交按钮 */
+const submitRejectForm = async () => {
+  const ids = selectionList.value.map((item) => item.id)
+  const billStatus = selectionList.value.map((item) => item.billStatus)
+
+
+  if(rejectform.rejectReason != null) {
+    const data = {
+      ids:ids,
+      reason:rejectform.rejectReason
+    }
+    await SaleOrderApi.rejectOrder(data).then(response => {
+      message.success("驳回成功");
+      rejectOpen.value = false;
+      getList();
+    });
+  }else {
+    message.error(`请填写驳回原因！`)
+  }
+}
+
+
+/** 驳回取消按钮 */
+const rejectCancel = () =>{
+  rejectOpen.value = false
+  rejectform.rejectReason = undefined
+}
+
+
+
+/** 查看订单详情 */
+const openDetail = (id: number) => {
+  push({ name: 'SaleOrderDetail', params: { id } })
+}
+
+const tableRowClassName = ({
+                             row,
+                             rowIndex,
+                           }: {
+  row: SaleOrderVO
+  rowIndex: number
+}) => {
+  if (row.billStatus === 'AA') {
+    return 'warning-row'
+  }
+  return ''
+}
+
+
+// 监听路由变化更新列表，解决订单保存/更新后，列表不刷新的问题。
+watch(
+  () => currentRoute.value,
+  () => {
+    getList()
+  }
+)
+
+/** 激活时 */
+onActivated(() => {
+  getList()
+})
+/** 初始化 **/
+onMounted(() => {
+  getList()
+  // 获得商品信息
+  getTabsCount()
+})
+</script>
+
+
+<style>
+  .el-table .warning-row {
+    --el-table-tr-bg-color: #D4D4D4;
+  }
+  .el-table .success-row {
+    --el-table-tr-bg-color: var(--el-color-success-light-9);
+  }
+</style>
diff --git a/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/saleOrder.data.ts b/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/saleOrder.data.ts
new file mode 100644
index 0000000..5b1a89c
--- /dev/null
+++ b/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/saleOrder.data.ts
@@ -0,0 +1,160 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const rules = reactive({
+})
+
+// CrudSchema https://doc.iocoder.cn/vue3/crud-schema/
+const crudSchemas = reactive<CrudSchema[]>([
+  {
+    label: '单据编号',
+    field: 'billno',
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '客户id',
+    field: 'customerId',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '业务日期',
+    field: 'bizdate',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    form: {
+      component: 'Input',
+      componentProps: {
+        type: 'textarea',
+        rows: 4
+      },
+      colProps: {
+        span: 24
+      }
+    },
+  },
+  {
+    label: '更新时间',
+    field: 'udate',
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '创建时间',
+    field: 'cdate',
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '确认日期',
+    field: 'confirmdate',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '计划日期',
+    field: 'plansenddate',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '手机',
+    field: 'phone',
+    isSearch: true,
+  },
+  {
+    label: '备注',
+    field: 'remarks',
+    isSearch: true,
+  },
+  {
+    label: '邮件列表，数据格式：xxx@xx.com;xxx@xx.com;',
+    field: 'emails',
+    isTable: false,
+  },
+  {
+    label: '发票抬头',
+    field: 'invoiceCode',
+    isTable: false,
+  },
+  {
+    label: '发票名称',
+    field: 'invoiceName',
+    isTable: false,
+  },
+  {
+    label: '地址',
+    field: 'address',
+    isTable: false,
+  },
+  {
+    label: '货币',
+    field: 'currency',
+    isTable: false,
+  },
+  {
+    label: '发票备注',
+    field: 'invoiceRemarks',
+    isTable: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false
+  }
+])
+export const { allSchemas } = useCrudSchemas(crudSchemas)
\ No newline at end of file