无关风月
2024-12-25 c28bf914fa4b92bacec6cb1d99d44d09e4ad2280
Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes
4个文件已修改
5475 ■■■■■ 已修改文件
.idea/misc.xml 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.idea/modules.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
logs/app.log 5449 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.idea/misc.xml
@@ -1,5 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="MavenProjectsManager">
    <option name="originalFiles">
      <list>
        <option value="$PROJECT_DIR$/common/pom.xml" />
        <option value="$PROJECT_DIR$/applet/pom.xml" />
        <option value="$PROJECT_DIR$/pom.xml" />
      </list>
    </option>
    <option name="ignoredFiles">
      <set>
        <option value="$PROJECT_DIR$/optometry/pom.xml" />
      </set>
    </option>
  </component>
  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/out" />
  </component>
.idea/modules.xml
@@ -2,7 +2,13 @@
<project version="4">
  <component name="ProjectModuleManager">
    <modules>
      <module fileurl="file://$PROJECT_DIR$/optometrist.iml" filepath="$PROJECT_DIR$/optometrist.iml" />
      <module fileurl="file://$PROJECT_DIR$/applet/applet.iml" filepath="$PROJECT_DIR$/applet/applet.iml" />
      <module fileurl="file://$PROJECT_DIR$/optometry/applet (2).iml" filepath="$PROJECT_DIR$/optometry/applet (2).iml" />
      <module fileurl="file://$PROJECT_DIR$/common/common.iml" filepath="$PROJECT_DIR$/common/common.iml" />
      <module fileurl="file://$PROJECT_DIR$/.idea/eyes.iml" filepath="$PROJECT_DIR$/.idea/eyes.iml" />
      <module fileurl="file://$PROJECT_DIR$/generator/generator.iml" filepath="$PROJECT_DIR$/generator/generator.iml" />
      <module fileurl="file://$PROJECT_DIR$/manage/manage.iml" filepath="$PROJECT_DIR$/manage/manage.iml" />
      <module fileurl="file://$PROJECT_DIR$/optometrist/optometrist.iml" filepath="$PROJECT_DIR$/optometrist/optometrist.iml" />
    </modules>
  </component>
</project>
logs/app.log
Diff too large
manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java
@@ -165,8 +165,8 @@
     * 库存明细记录列表
     */
    @ApiOperation(value = "镜片库存明细记录列表--库存详情")
    @PostMapping(value = "/detailLensList")
    public ApiResult<TLensGoodsDetailVO> detailLensList(Integer id) {
    @PostMapping(value = "/detailLensListDetail")
    public ApiResult<TLensGoodsDetailVO> detailLensListDetail(Integer id) {
        TLensGoodsDetailVO tLensGoodsDetailVO = new TLensGoodsDetailVO();
        TLensGoods byId = lensGoodsService.getById(id);
        TStore byId1 = storeService.getById(byId.getStoreId());