Merge branch 'master' of ssh://git.jizhiweb.cn:2222/clinic-v2/server

src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java

@@ -224,10 +224,11 @@ public class ChargeService extends BaseService {
             }
             //组套逻辑
             if (dbService.getIsGroup()) {
-                List<ItemGroupList> itemGroupList = itemGroupListMapper.selectList(new QueryWrapper<ItemGroupList>().eq("item_id", dbService.getId()));
+                List<ItemGroupList> itemGroupList = itemGroupListMapper.selectList(new QueryWrapper<ItemGroupList>().eq("item_id", dbService.getId()).eq("del_flag",false));
                 if (itemGroupList.isEmpty()) {
                     throw new MessageException("组套:" + service.getItemName() + "没有绑定商品数据");
                 }
+
                 for (ItemGroupList itemGroup : itemGroupList) {
                     String fsn = StringUtil.getCode("FSN");
                     ChargeItemList itemList = new ChargeItemList();

src/main/resources/doc_title/1314.json

@@ -38,14 +38,14 @@
     "11": {
       "en": "json.data_creation_time",
       "zh": "数据创建时间",
-      "column_width": 100
+      "column_width": 150
     }
   },
   {
     "12": {
       "en": "json.data_update_time",
       "zh": "数据更新时间",
-      "column_width": 100
+      "column_width": 150
     }
   },
   {